Clean up typos and run tests