Modified WordCount.java and test.java