Removed spurious test failures.
Correct handling of Empty messages.