add package, fix tests