Fix tests
Merge branch 'fix_tests' into messages_config