Fixing failing unit test (cherry picked from commit a267242)
Fixing failing unit test