fixup unit tests