Fix functional test reliability