Clean up test comments and defines, finish fetch output nits.