adding test selector for ec2
making connections lazy
cleaning up