modify Test.java at test_branch
merge before