Added Tests and Modified Models

Hi Brandon, Please review changes to code and tests Andrew and I made in order for Import to work correctly.

Thanks,
Sami