More failing mocked tests fixed