Merge fixes

Fixed errors in EC2Cloud and two of the unit tests; Test constructors
weren't including spotConfig.