Fix broken test for count
Resolve tasks