Merge "Unskip test skipped because of closed bugs"