Unit test cases improvements