Fixed util unitary test... more tests remain unfixed :(