Clean up tests and fix typos