Issue #29: Fixed unittests