patched up some unit tests