Fixed failing TestCases