test case improvements