Some minor work for building our tests.