fixup some testing stuff