Issue #421 fix tests