Start updating scalar 2d test suite for combined corr, bilin and stout