updated code to reflect new package name, fixed tests