Various bug fixes

Mainly to do with how count's fall back's work and some fixes to tests
that broke when I fixed sub locales