* More work on unit tests.
  * Adding a special feature for Max.