Corrected failing tests, 4-6

[#54151678]
Corrected last two failing tests. 

[#54151678]