Ultra minor style refactorings
Added count
Modified count, added missing tests