Unit test case improvements