rewriting tests to use json schema