Ec2 Service Catalog tests

Work In progress PR
So, if the only difference is the form, it should be easy to override?