Test rework

Remove pointless and complex logging from tests, and skip a test that needs mocking.