Almost all testcases are working now