Fixed local merge conflict
Fixed tests