[Broken] Add schema decomposition, working for some specs.
Fix schema decomposition for all tests.