Updated changelog.
Unittest for Issue #178, #395.