Unit test enhancement