diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
index 48fc0510ce..92d6382eb3 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/CMakeLists.txt
@@ -80,6 +80,8 @@ qt_add_executable(
   # when we can use target_link_libraries with OBJECT libraries
 )
 
+set_target_properties(${PROJECT_NAME} PROPERTIES AUTORCC ON)
+
 set(TAP_LINK_LIBRARIES cafUserInterface)
 
 if(USE_COMMAND_FRAMEWORK)
@@ -101,6 +103,15 @@ target_link_libraries(
                           ${EXTERNAL_LINK_LIBRARIES}
 )
 
+# Make the executable runnable from its own folder (platform plugins etc.)
+if(WIN32 AND TARGET Qt6::windeployqt)
+  add_custom_command(
+    TARGET ${PROJECT_NAME}
+    POST_BUILD
+    COMMAND Qt6::windeployqt --no-translations $<TARGET_FILE:${PROJECT_NAME}>
+  )
+endif()
+
 foreach(qtlib ${QT_LIBRARIES})
   add_custom_command(
     TARGET ${PROJECT_NAME}
diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.cpp
index 0cb2c91026..6f5d7bdcdf 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.cpp
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.cpp
@@ -43,6 +43,7 @@ SmallDemoPdmObjectA::SmallDemoPdmObjectA()
                        " Toggle Field whatsthis" );
 
     CAF_PDM_InitField( &m_pushButtonField, "Push", false, "Button Field", "", "", " " );
+    m_pushButtonField.uiCapability()->setAttribute( caf::PdmUiTableViewEditor::CellKeys::PUSH_BUTTON_TEXT, "Edit" );
     CAF_PDM_InitField( &m_doubleField,
                        "BigNumber",
                        0.0,
@@ -70,6 +71,8 @@ SmallDemoPdmObjectA::SmallDemoPdmObjectA()
     CAF_PDM_InitFieldNoDefault( &m_multipleAppEnum, "MultipleAppEnumValue", "MultipleAppEnumValue", "", "", "" );
     m_multipleAppEnum.capability<caf::PdmUiFieldHandle>()->setUiEditorTypeName(
         caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
+    m_multipleAppEnum.uiCapability()->setAttribute<caf::PdmFieldHandle*>( caf::PdmUiTreeSelectionEditor::Keys::CURRENT_INDEX_FIELD_HANDLE,
+                                                                          &m_highlightedEnum );
     CAF_PDM_InitFieldNoDefault( &m_highlightedEnum, "HighlightedEnum", "HighlightedEnum", "", "", "" );
     m_highlightedEnum.uiCapability()->setUiHidden( true );
 }
@@ -233,33 +236,3 @@ QList<caf::PdmOptionItemInfo> SmallDemoPdmObjectA::calculateValueOptions( const
 
     return options;
 }
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void SmallDemoPdmObjectA::defineEditorAttribute( const caf::PdmFieldHandle* field,
-                                                 QString                    uiConfigName,
-                                                 caf::PdmUiEditorAttribute* attribute )
-{
-    if ( field == &m_multipleAppEnum )
-    {
-        caf::PdmUiTreeSelectionEditorAttribute* attr = dynamic_cast<caf::PdmUiTreeSelectionEditorAttribute*>( attribute );
-        if ( attr )
-        {
-            attr->currentIndexFieldHandle = &m_highlightedEnum;
-        }
-    }
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-void SmallDemoPdmObjectA::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
-{
-    caf::PdmUiTableViewPushButtonEditorAttribute* attr =
-        dynamic_cast<caf::PdmUiTableViewPushButtonEditorAttribute*>( attribute );
-    if ( attr )
-    {
-        attr->registerPushButtonTextForFieldKeyword( m_pushButtonField.keyword(), "Edit" );
-    }
-}
diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.h b/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.h
index 30e8541ba1..faf8ca7520 100644
--- a/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.h
+++ b/Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObjectA.h
@@ -41,13 +41,6 @@ public:
     void setAutoValueForDouble( double value );
     void setAutoValueForInt( double value );
 
-protected:
-    void defineEditorAttribute( const caf::PdmFieldHandle* field,
-                                QString                    uiConfigName,
-                                caf::PdmUiEditorAttribute* attribute ) override;
-
-    void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
-
 private:
     caf::PdmField<double>                     m_doubleField;
     caf::PdmField<int>                        m_intField;