Added tests for remaining singular Import scenarios.

Would be a good idea to test this more thoroughly with more elaborate combinations, but this is sufficient for now.