Modifications to support multiple independent unit test
binaries.