diff --git a/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/sandbox/ExtraStudentFileAwareFileMovingPolicy.java b/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/sandbox/ExtraStudentFileAwareFileMovingPolicy.java
index 3ccc69bc0..18b7ffc02 100644
--- a/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/sandbox/ExtraStudentFileAwareFileMovingPolicy.java
+++ b/tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/sandbox/ExtraStudentFileAwareFileMovingPolicy.java
@@ -23,7 +23,7 @@
  */
 public abstract class ExtraStudentFileAwareFileMovingPolicy implements FileMovingPolicy {
 
-    private static final String TMC_PROJECT_YML = ".tmcproject.yml";
+    private static final Path TMC_PROJECT_YML = Paths.get(".tmcproject.yml");
 
     private List<Path> extraStudentFiles;
     private Path rootPath;
@@ -44,7 +44,7 @@ public boolean shouldMove(Path path, Path rootPath, Path target) {
             return false;
         }
 
-        if (path.endsWith(TMC_PROJECT_YML)) {
+        if (path.getFileName().equals(TMC_PROJECT_YML)) {
             return false;
         }
 
diff --git a/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/TestCaseTest.java b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/TestCaseTest.java
index 3f5f61edc..05c69ef53 100644
--- a/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/TestCaseTest.java
+++ b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/TestCaseTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import fi.helsinki.cs.tmc.langs.TestCase;
 import fi.helsinki.cs.tmc.langs.TestCase.Status;
 
 import org.junit.Test;
diff --git a/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/sandbox/SubmissionProcessorTest.java b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/sandbox/SubmissionProcessorTest.java
index bfc35689d..82b7c7715 100644
--- a/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/sandbox/SubmissionProcessorTest.java
+++ b/tmc-langs-framework/src/test/java/fi/helsinki/cs/tmc/langs/sandbox/SubmissionProcessorTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.apache.commons.io.FileUtils;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;