Removing AWS::SNS override and re-working tests