Simplify
Fix tests
Changed test to JUnit 4
Fix test to run as single test class under Eclipse