Adding utils and tests