Wrote some more test infrastructure.