Ec2 Service Catalog tests

Work In progress PR
I don;t believe you need setup_providers here???