migrated remaining JUnit 3 tests to 4-Annotations