Fixed tests. Issue: #370