fix unit test
fix stuff
fix util