MLDS-256 fix up tests