simplify and separate tests for import