continuing to fix up tests