some improvements in test cases