Temporary fix failing test cases because of latest changes