better test coverage and stats coverage for internal calls