Issue #2364589 by djdevin: Fixed Anyone can provide feedback.
Fix broken test cases.