Renames test classes and moves mocking code into Reader test cases