Migrated to JUnit 4