test_util.py and util.py need to be reviewed.