Fix SQS integration and unit tests