patch up some unit tests