refactor test file to make imports comply with new package structure