Rename test packages
Update import statement