Something must have been overwritten in the merge - how did you get the tests to keep running with this change?