Added some future test cases