Fixed test. Issue: #580