(UserVoice) Fix unit test failure, review followup