final test fixup