Issue #434 update tests