PLAT-4829 - Fixes for ViewRegressionTestSetup