Minor fixes in schema. Now we load successfully all test cases :)