Improved testcases.