Adding mappers
Clean up test content