fix tests for new merge