Changing the package name and adding more jUnit tests