more fixup to test