Sorting out package definitions for tests
Fixing issue with package names