Decoupling the SQS-only subscription from SNS

Work to remove the SNS/Topic connection from the SQS subscription.
Some tidy up - property names, test reliability, simplification, etc.