Added even more testcases