Change package name and fix test