Fix some tests related to tags