Merge "Remove unnecessary client alias in console tests"