fix up fnord test code more.