Fix spurious conform test failures