Cleaned up package.json and tests