Implement some more test cases