Updated MapModel, got tests passing.