Adding in more test cases