fix up tests for recent changes