Corrected unit tests that used the old style of schema filtering (to be replaced)