Use tag loader to reset schema
Fix tests