patch up unit tests