Fix & update unit tests, change naming convention to *Test.java.