Improved test logging and minor bug fixes
Merge branch 'master' of https://github.com/cmu440/p1