Adding utility tests