fix up unit tests