Issue #837922 by twistor, andrewlevine: Added removeMappings() to test suite and more extensive addMapping testing.