Change to tag count ordering
Test fixes
Test fixes