Reading test, cleanups