(changed) minor code cleanup
(changed) migrated unit tests to JUnit 4