fix up some tests