Pulled out Map status messages and added tests for new method.