Update DesiredCapacity if AutoScalingGroup.desired_capacity is not None as fix for boto/boto#1757
Use appropriate unittest assertions for instance types in autoscaling tests