Fix merge of tests.