Issue #29: Minor changes to fix unittests