Make room for new test code

This change is split over several commits so it is easier to see.
This change adds some extra lines, which will be populated in the next
commit.

Author: hmac