Add SAFTExportTest. Refactor util classes
merge