Fixed a conflict on master, with the changes made to the tests in another pull request.