Fix failing TC in flow-services suite