ammened tests to work with new schema option