Minor improvement in test hack