Merge "Unit test for User::getEditCount"