Tidying up package.json and tests