Revert changes to unit tests that cause compilation errors in Java 6