Issue #445 completed. Tests were fixed