Cleaned up Test.java