Adding a few test cases. Needs more work.