Fixes count and longcount tests