Added a number of additional test cases