ExportFieldExtractor unit test + major service layer refactor