patch up tests to reflect recent changes