fix null pointer bug, and fix buggy unit test (mocked class not behaving like implementation)
update changelog prior to release