Added new test cases.
Deleted old test cases.