Make all 3 schema transformer test cases pass

Change-Id: I790602309d5ad8447011cd32e41b36a62954a125
Merge "Make all 3 schema transformer test cases pass"