mapping object created for Dispose. Tests amended and passing