Fixed test. Issue: #508