Make data ingest tweaks

Use @Before in tests
Change string parameter to Environment enum
Remove unused imports