Remove old schemas from testdata; update unit tests for new schema.
Update unit tests to use new schema.