Fixed failing messages tests.