merge tests properly