fixed the merge issues with the tests