KeySchema code broke JsonTest and TableTest.
They are resolved with this commit.