Migrated JUnit3 to Junit4

Fixes #26