Adding testcases per review comments