Add testing for utils