Merge "Fix the unit test for stats swap"