Merge "Fixing testOverview test" into sc-dev