Worked on test cases some more