Add testSQS-2 and tidy up