papi: improve unit testability