Merge "Revert "Fixing testOverview test"" into sc-dev