Grooming: Removed Eclipse warnings and upgraded some tests to JUnit 4.