Minor improvements to build testing.