More indirections suppressed, getting closer
Simplify test code