Additional tests migrated to JUnit