unit test enhancement