merge tests
move tests