diff --git a/webgoat-container/pom.xml b/webgoat-container/pom.xml
index 0cd862dfc..0db4bf3e7 100644
--- a/webgoat-container/pom.xml
+++ b/webgoat-container/pom.xml
@@ -116,11 +116,6 @@
             <artifactId>asciidoctorj</artifactId>
             <version>1.5.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.liquibase</groupId>
-            <artifactId>liquibase-core</artifactId>
-            <version>3.4.1</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
index 0558a5ad3..bbd993c77 100644
--- a/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
+++ b/webgoat-container/src/main/java/org/owasp/webgoat/lessons/Assignment.java
@@ -37,6 +37,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @NoArgsConstructor
 @Getter
+@EqualsAndHashCode
 public class Assignment {
     @NonNull
     private String name;
diff --git a/webgoat-container/src/main/resources/application.properties b/webgoat-container/src/main/resources/application.properties
index f582a16e6..60f03bce2 100644
--- a/webgoat-container/src/main/resources/application.properties
+++ b/webgoat-container/src/main/resources/application.properties
@@ -31,14 +31,3 @@ webgoat.default.language=en
 
 spring.data.mongodb.database=webgoat
 spring.mongodb.embedded.storage.databaseDir=${webgoat.user.directory}/mongodb/
-
-
-liquibase.change-log=classpath:db/changelog/db.changelog-master.xml
-spring.datasource.url=jdbc:hsqldb:file:${user.home}/.webgoat/WebGoatDatabase;hsqldb.write_delay=false
-spring.datasource.driverClassName=org.hsqldb.jdbcDriver
-spring.datasource.username=sa
-spring.datasource.password=
-spring.jpa.database-platform=org.hibernate.dialect.HSQLDialect
-spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=none
-
diff --git a/webgoat-container/src/test/java/org/owasp/webgoat/session/LessonTrackerTest.java b/webgoat-container/src/test/java/org/owasp/webgoat/session/LessonTrackerTest.java
index 4f11569ce..194b30b2c 100644
--- a/webgoat-container/src/test/java/org/owasp/webgoat/session/LessonTrackerTest.java
+++ b/webgoat-container/src/test/java/org/owasp/webgoat/session/LessonTrackerTest.java
@@ -70,5 +70,18 @@ public class LessonTrackerTest {
         assertThat(lessonOverview.get(a2)).isFalse();
     }
 
+    @Test
+    public void solvingSameAssignmentShouldNotAddItTwice() {
+        AbstractLesson lesson = mock(AbstractLesson.class);
+        Assignment a1 = new Assignment("a1", "a1");
+        List<Assignment> assignments = Lists.newArrayList(a1);
+        when(lesson.getAssignments()).thenReturn(assignments);
+        LessonTracker lessonTracker = new LessonTracker(lesson);
+        lessonTracker.assignmentSolved("a1");
+        lessonTracker.assignmentSolved("a1");
+
+        assertThat(lessonTracker.getLessonOverview().size()).isEqualTo(1);
+    }
+
 
 }