+ add override method
+/- migrate tests to JUnit
+/- migrate tests to JUnit