Working on unit tests for changes due to issue #207.