Issue #464 completed. Unit tests was fixed.