Clean up tests and package.json