Cleaned up the Test.java (main method)