Modify tests for MapMessageSource