Update unit tests to work with AmazonEC2Cloud having a 'name'