am dd03c2dd: am 9cb6643f: Merge "A little work on unit testing."

* commit 'dd03c2ddf825e2f78b5ef4cca4b07cc85f5cfb11':
  A little work on unit testing.