Re: Fixing the conformance tests