Cleanup map-related tests