Update FindAll Methods in TestCases