back to explisit relative packages
simplify tests