fix up tests a bit