Added a couple new test cases