fixed up the model names
Fixed tests