Fix test imports to the current module structure

This allows again to run the tests by running a single file