Fix failing testcases