Got testcases working