Fixed tests. Issue: #600