making output_gnuplot more universal + cleanups in 2D tests