Improved test cases.