Updated to include cloudformation template for testing