Unit test fixup229