Fixed the model mapping tests