Issue #92,modified tests