collateral test fixes