Merge "Revert "Fix broken unit test""