Some removal of duplicate setup code and renaming package in prod code
affected the imports in the test suite