Updated more Test cases