renamed mapping compatibilty setting to it's functionality
Fixed unit tests for last checkin