UTEST: Fix and outdate unit test