Minor changes, starting JUnit tests