* Ensure duplicates are not imported * Clean up some unnecessary code * Added some fancy tests for bulk import.