more sqs fixes and elb test fixes