I hate Java
before merge
new test structure