Tests are now using JUnit 4
Changed visibility of some fields, removed unnecessary getters/setters