Expand Schema test coverage