Comment out mocking and new tests which break things