diff --git a/src/test/llm/chat_template_end_to_end_minja_test.cpp b/src/test/llm/chat_template_end_to_end_minja_test.cpp
index 59b489b263..c8b909492c 100644
--- a/src/test/llm/chat_template_end_to_end_minja_test.cpp
+++ b/src/test/llm/chat_template_end_to_end_minja_test.cpp
@@ -253,7 +253,6 @@ TEST_F(ChatTemplateEndToEndMinjaTest, Gemma4_ToolCallWithStringArgs) {
     EXPECT_TRUE(caps.requiresObjectArguments);
     EXPECT_TRUE(caps.missnamedReasoningField.empty());
 
-    // FIXME: Why is </s> here? because of facebook-opt125?
     std::string expectedOutput = R"(</s><|turn>user
 What's the weather in Paris?<turn|>
 <|turn>model
diff --git a/src/test/mediapipe_framework_test.cpp b/src/test/mediapipe_framework_test.cpp
index 9b1613529b..4b1c644934 100644
--- a/src/test/mediapipe_framework_test.cpp
+++ b/src/test/mediapipe_framework_test.cpp
@@ -485,7 +485,7 @@ TEST_F(MediapipeNegativeFrameworkTest, NoOutputPacketProduced) {
 }
 
 TEST_F(MediapipeNegativeFrameworkTest, ExceptionDuringProcess) {
-    GTEST_SKIP() << "Terminate called otherwise";  // TODO FIXME check
+    GTEST_SKIP() << "Terminate called otherwise";
     SetUpServer(getGenericFullPathForSrcTest("/ovms/src/test/mediapipe/negative/config_exception_during_process.json").c_str());
     const ovms::Module* grpcModule = server.getModule(ovms::GRPC_SERVER_MODULE_NAME);
     KFSInferenceServiceImpl& impl = dynamic_cast<const ovms::GRPCServerModule*>(grpcModule)->getKFSGrpcImpl();
@@ -507,7 +507,7 @@ TEST_F(MediapipeNegativeFrameworkTest, ExceptionDuringProcess) {
         SPDLOG_ERROR("ER: unknown exception");
     }
 }
-TEST_F(MediapipeNegativeFrameworkTest, ExceptionDuringGetContract) {  // TODO FIXME add checks to exception handling?
+TEST_F(MediapipeNegativeFrameworkTest, ExceptionDuringGetContract) {
     SetUpServer(getGenericFullPathForSrcTest("/ovms/src/test/mediapipe/negative/config_exception_during_getcontract.json").c_str());
     const ovms::Module* grpcModule = server.getModule(ovms::GRPC_SERVER_MODULE_NAME);
     KFSInferenceServiceImpl& impl = dynamic_cast<const ovms::GRPCServerModule*>(grpcModule)->getKFSGrpcImpl();