Added a few more additional test cases