merge tests!