Add utility tests