Added some test cases.

Will update as necessary.