Fix count all tests