Changes to test to make them pass in a merge build