MappingAlgorithm now passes all tests