Fixed failing test:- The surfaces differ in order on different machines, so only assert whether all the surfaces are present.Related to Issue [MWDAM-1374]
Replaced First() by SingleOrDefault(). Reverted new grid testing as this depends on other changes too which can not yet be committed as these have nothing to do with this issue.Related to Issue [MWDAM-1632]