Adds a collection of unit tests for the importing code; along with little fixes that were revealed.