improved test cases