Fix Count API tests