Fixes to schema and test data.