Simplify some test cases.
Add test case.