Change package name and fix tests