Changed GetCurrentModel to return the model instead of the tuple

Assets/Common/Interfaces/ModelList.cs

@@ -41,10 +41,9 @@ public class ModelList : ScriptableObject
     /// </summary>
     /// <param name="modelIndex">ModelIndex of the model</param>
     /// <returns>Model associated with this index, null if no model was found</returns>
-    public ModelTuple GetCurrentModel()
+    public NNModel GetCurrentModel()
     {
-        //if(currentModelIndex < models.Find)
-        return models.Find(x => x.model == models[currentModelIndex].model);
+        return models.Find(x => x.model == models[currentModelIndex].model)?.model;
     }
 
     /// <summary>

Assets/Common/Tests/ModelListTest.cs

@@ -35,14 +35,17 @@ public class ModelListTest
             }
         }
     }
-
+    /// <summary>
+    /// Check if current model can be correctly gotten as current via GetCurrentModel
+    /// </summary>
+    [Test]
     public void TestGetCurrentModel()
     {
         System.Random random = new System.Random();
         ModelIndex value = (ModelIndex)random.Next(modelList.models.Count);
         modelList.SetCurrentModel(value);
 
-        Assert.AreEqual(value, modelList.GetCurrentModel().index);
+        Assert.AreEqual(modelList.models[modelList.currentModelIndex].model, modelList.GetCurrentModel());
 
         // Check if empty model fails gracefully (returns null)
         Assert.IsNull(ScriptableObject.CreateInstance<ModelList>().GetCurrentModel());