Add some additional test cases