Some minor cleaning up following our improved building of tests.