Issue #57: Fixed unittest