Fix tests for tag issues