Fix package name and tests