changed source files so that tests function with the new package name