Last unit test fixed