Feature/importutest2

Moved import unit tests to a new branch; this one is more complete.