Adding new changes for the mocked tests