Update code with feedback from Mark & Mike
Add unit tests for utils.py