Add naming test and call counter