Added testcases which were left out from last couple of commits.