changed the package
changed the package and added some tests