Cleaned up Test.java (main method)