Merge "Fix unit test that failed due to incorrect refactor."