Add test and util packages