Individual mapping objects created, tests amended and passing