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

* commit '9cb6643f2ae027fefd682e7940009fb4f8f0721e':
  A little work on unit testing.