add no kill option to ec2 tester with fix 2