Merge "consistent use of v23 test generate in order to use TestMain and in turn call test.Init."