Renamed classes and switched tests to jUnit 4