HW6 - More test cases passing