Continue combining corr, bilin and stout targets, start updating scalar test suite
Finish updating scalar test suite for combined corr, bilin and stout
More updated to combine corr, bilin and stout