Adding functional db load tests and starting to refactor the main import functionality.