r18038: make test fns static