Better import in tests