Updated SNS Message Validator tests

...And rebased onto master.