Merge pull request #570 from naumenkogs/2020_04_routing_message_handler_tests