Adjuting tests to handle new schema wrappers