merge new_tests with master