unit tests fixes backported from 1.2 branch for issue #236
Updated change log.
Re-added some code that got overwritten in previous commit.
Updated change log
resolve change log merge conflict
Merge pull request #253 from chapmandu/master

Updated change log