test cases enhancements