Fix utils, add specs