a few updates to the util class and updated tests