Improved test cases