changed package name, added further tests