cleaned up test file to contain only unit tests, added test for data generator and importer