Ec2 Service Catalog tests

Work In progress PR