Add types to test-class mappers