This is necessary because the changes for this issue are going to make the mocked version of the tests invalid.