Refactor tests and remove ReaderTestBase; replaced by MainTestBase