Merge "bug 2266 : added more types of schema nodes to increase code coverage"