Update tests to work with new schema.