Fixed all failing testcases