Fix failing test cases for master

This are minimal changes required to fix the existing test cases such that build is back to green for master.