enhanced RedeemTests to handle systems running on openStack