Tackling more test cases