ec2: get more tests passing

/cc @mwhooker - I'm unsure why this last test is failing...