trying to fix up unit tests