Test case failure fixes