Tests fixup