Implemented TODO for unit test verification