Ec2 Service Catalog tests

Work In progress PR
Is this copy/pasted from `provisioning.py`? If so, why not import it?