modified schema, could break more tests?