Cleaned project, add JUnit 4 support