Fix intermittent unit test failures caused by order of initialization of
static variables.