Updated tests with new knowledge about the schema.