robustify COUNT-FULL-CALLS in the test suite