Added a few additional test cases.