Improved test case