Migrate hybrid functional tests to RFC8040