Fix util package name
Fix the basic code and util test