Fixed tests to match constructors
Merge branch 'HEAD' of https://github.com/bwall/ec2-plugin.git