fix up tests