Add import statements as a result of change in location to test package