Fix up failing tests.
Update map spec with mocks.