Unit testing for Issue #42