Working on testcases