fixes to some unit tests