merged Test.java manually