Added check for updating removed models
Fixed tests