Added a test for the mapper service and changed the generics on the FileGenerator class.