From af0d1aa33a17dee3c3663a064ddc8aed572f19c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tam=C3=A1s=20Balog?= <picimako@gmail.com>
Date: Sat, 24 Jul 2021 08:55:08 +0200
Subject: [PATCH] Release v0.6.0 changes (#58)

* #52: Add search capability to the Terra Wdio tool window

* Fix a NPE related to toggling statistics.

* #53: add support for terra-functional-testing in the currently available feature set

* Fix disposal logic of the root and spec node

* #53: Update Terra wdio quick documentation provider to retrieve values from a dedicated bundle, and added links to terra-functional-testing documentation

* #53: Add inspection to validate various Terra helper properties. Define sections in TerraBundle for better readablity. Move methods from TerraWdioInspectionBase to TerraWdioPsiUtil.

* Improve Terra Functional Testing specific screenshot name resolution and add unit test for error handling of collecting screenshots

* #44, #53: Add inspection to convert Terra.it helpers to Terra.validates forms. Replace some information in the readme with custom badges.

* #53: Create inspections to validate the presence of screenshot names and the absence of duplicate screenshot names. Implement NoopResourceManager for projects not using any of the Terra libraries.Remove some commented out code.
---
 CHANGELOG.md                                  |  24 +++
 CONTRIBUTE.md                                 |  38 +---
 README.md                                     |   4 +-
 ..._terra_it_quick_fix_before_hook_merged.png | Bin 0 -> 1536 bytes
 ...rra_it_quick_fix_before_hook_unaltered.png | Bin 0 -> 1526 bytes
 assets/replate_terra_it_quick_fix_simple.png  | Bin 0 -> 1094 bytes
 changelog.html                                |   8 +-
 ...{terra_screenshots.md => terra_helpers.md} | 180 +++++++++++-----
 docs/terra_wdio_tool_window.md                |   3 +
 .../picimako/terra/FileTypePreconditions.java |  16 +-
 ...escribeViewportsDocumentationProvider.java |  43 ++--
 .../documentation/TerraQuickDocBundle.java    |  43 ++++
 .../TerraWdioDocumentationProvider.java       |  53 ++---
 .../TerraWdioDocumentationService.java        |  47 ----
 .../picimako/terra/psi/js/JSArgumentUtil.java |  23 +-
 .../picimako/terra/resources/TerraBundle.java |   8 +-
 .../terra/wdio/NoopResourceManager.java       | 102 +++++++++
 .../terra/wdio/ScreenshotContextParser.java   |  44 ++++
 .../terra/wdio/SpecFolderCollector.java       |  61 ++++++
 .../wdio/TerraFunctionalTestingManager.java   |  68 ++++++
 ...ctionalTestingScreenshotContextParser.java |  57 +++++
 .../wdio/TerraResourceHandlerProvider.java    |  36 ++++
 .../terra/wdio/TerraResourceManager.java      | 103 +++++++++
 .../terra/wdio/TerraToolkitManager.java       |  68 ++++++
 ... TerraToolkitScreenshotContextParser.java} |  36 ++--
 .../picimako/terra/wdio/TerraWdioFolders.java |  36 ++--
 .../terra/wdio/TerraWdioInspectionBase.java   |  42 +---
 .../picimako/terra/wdio/TerraWdioPsiUtil.java | 129 +++++++++--
 .../wdio/ToScreenshotUsageNavigator.java      |   9 +-
 .../AbstractScreenshotsPreview.java           |  12 +-
 .../TerraScreenshotsDiffViewContainer.java    |  12 +-
 ...ceTerraItWithTerraValidatesInspection.java | 171 +++++++++++++++
 ...ateToScreenshotUsageProjectViewAction.java |   8 +-
 .../AbstractScreenshotNameResolver.java       |  54 +++++
 .../screenshot/ScreenshotNameResolver.java    |  72 +++++++
 ...nctionalTestingScreenshotNameResolver.java |  97 +++++++++
 .../screenshot/TerraScreenshotCollector.java  |   8 +-
 ...> TerraToolkitScreenshotNameResolver.java} |  46 +---
 ...creenshotValidationLineMarkerProvider.java |   8 +-
 .../TerraScreenshotInlayHintsProvider.kt      |   7 +-
 .../DuplicateScreenshotNameInspection.java    |  89 ++++++++
 .../GlobalTerraSelectorInspection.java        |  13 +-
 ...idTerraValidationPropertiesInspection.java |  88 ++++++++
 .../MissingScreenshotInspection.java          |  15 +-
 .../MissingScreenshotNameInspection.java      |  72 +++++++
 ...otMismatchToleranceBlockingInspection.java |  25 ++-
 ...ScreenshotMismatchToleranceInspection.java |  20 +-
 ...onIsPreferredOverScreenshotInspection.java |  22 +-
 ...raFunctionalTestingPropertiesProvider.java |  50 +++++
 .../inspection/TerraPropertiesProvider.java   |  45 ++++
 .../TerraToolkitPropertiesProvider.java       |  51 +++++
 .../reference/TerraScreenshotPsiFile.java     |   6 +-
 .../reference/TerraScreenshotReference.java   |  11 +-
 .../TerraScreenshotReferenceContributor.java  |  17 +-
 .../AbstractTerraWdioTreeModel.java           | 160 ++++++++++++++
 .../FindUnusedScreenshotsAction.java          |  32 +--
 ...ioExternalFileAndFolderChangeListener.java |   3 +-
 .../toolwindow/TerraWdioScreenshotsPanel.java |   3 +
 .../TerraWdioToolWindowFactory.java           |   8 +-
 .../terra/wdio/toolwindow/TerraWdioTree.java  |  87 --------
 .../toolwindow/TerraWdioTreeCellRenderer.java |  77 -------
 .../wdio/toolwindow/TerraWdioTreeModel.java   | 200 +++++-------------
 .../toolwindow/ToggleStatisticsAction.java    |   4 +-
 .../AbstractTerraWdioToolWindowAction.java    |   2 +-
 ...eLatestWithReferenceScreenshotsAction.java |   6 +-
 .../action/DeleteScreenshotsAction.java       |  16 +-
 .../NavigateToScreenshotUsageAction.java      |  17 +-
 .../action/RenameScreenshotsAction.java       |  24 +--
 .../ReplaceReferenceWithLatestAction.java     |  14 +-
 .../action/ShowDiffScreenshotsAction.java     |   6 +-
 .../action/TerraWdioDataRetrieverUtil.java    |   2 +-
 .../TerraWdioScreenshotActionsGroup.java      |   2 +-
 ...eListeningScreenshotNodeActionInvoker.java |   2 +-
 ...yListeningScreenshotNodeActionInvoker.java |   2 +-
 .../event/ToolWindowPopupMenuInvoker.java     |   2 +-
 .../event/TreeNodeTypeIdentifier.java         |   6 +-
 .../{ => node}/AbstractTerraWdioTreeNode.java |  28 ++-
 .../wdio/toolwindow/node/TerraWdioTree.java   | 140 ++++++++++++
 .../{ => node}/TerraWdioTreeNode.java         |  34 +--
 .../TreeModelDataRoot.java}                   |  36 ++--
 .../TreeScreenshotNode.java}                  |  20 +-
 .../TreeSpecNode.java}                        |  41 ++--
 ...icateDescribeViewportsBlockInspection.java |  28 +--
 ...beViewportsBlocksNotAllowedInspection.java |  12 +-
 ...raDescribeViewportsBlockingInspection.java |  15 +-
 .../TerraDescribeViewportsInspection.java     |  13 +-
 src/main/resources/META-INF/plugin.xml        |  22 +-
 .../documentation/terra-wdio-docs.properties  |  12 --
 .../DuplicateScreenshotName.html              |  28 +++
 .../InvalidTerraValidationProperties.html     |  57 +++++
 .../MissingScreenshotName.html                |  27 +++
 .../ReplaceTerraItWithTerraValidates.html     |  28 +++
 .../resources/messages/TerraBundle.properties |  23 +-
 .../messages/TerraQuickDocBundle.properties   |  47 ++++
 .../terra/FileTypePreconditionsTest.java      |  22 ++
 .../terra/TerraFunctionalTestingTestCase.java |  40 ++++
 .../picimako/terra/TerraToolkitTestCase.java  |  40 ++++
 ...ibeViewportsDocumentationProviderTest.java |  99 ++++-----
 .../TerraWdioDocumentationProviderTest.java   | 103 ++-------
 .../terra/psi/js/JSArgumentUtilTest.java      |  26 +++
 ...raFunctionalTestingInspectionTestCase.java |  36 ++++
 ...ctionalTestingSpecFolderCollectorTest.java |  57 +++++
 .../wdio/TerraInspectionBaseTestCase.java     |   8 +
 .../wdio/TerraToolkitInspectionTestCase.java  |  36 ++++
 .../TerraToolkitSpecFolderCollectorTest.java  |  50 +++++
 .../terra/wdio/TerraWdioFoldersTest.java      |  14 --
 ...erraWdioPsiUtilScreenshotPropertyTest.java |  29 +++
 .../terra/wdio/TerraWdioPsiUtilTest.java      |  95 ++++-----
 .../wdio/ToScreenshotUsageNavigatorTest.java  |  11 +-
 .../AbstractScreenshotsPreviewTest.java       |   5 +-
 .../DiffScreenshotsPreviewTest.java           |   5 +-
 ...ferenceToLatestScreenshotsPreviewTest.java |   4 +-
 ...nalTestingScreenshotContextParserTest.java |  41 ++++
 ...lidatesInspectionForAccessibilityTest.java |  48 +++++
 ...aValidatesInspectionForScreenshotTest.java |  52 +++++
 ...rraItWithTerraValidatesInspectionTest.java |  84 ++++++++
 ...oScreenshotUsageProjectViewActionTest.java |   5 +-
 ...onalTestingScreenshotNameResolverTest.java |  85 ++++++++
 .../TerraScreenshotCollectorTest.java         |  23 +-
 .../TerraScreenshotNameResolverTest.java      | 119 -----------
 ...erraToolkitScreenshotNameResolverTest.java | 176 +++++++++++++++
 ...nshotValidationLineMarkerProviderTest.java |   5 +-
 ...tInlayHintsProviderNoGlobalSelectorTest.kt |   3 +
 .../TerraScreenshotInlayHintsProviderTest.kt  |   3 +
 ...DuplicateScreenshotNameInspectionTest.java |  48 +++++
 .../GlobalTerraSelectorInspectionTest.java    |   4 +-
 ...aFTValidationPropertiesInspectionTest.java |  42 ++++
 ...kitValidationPropertiesInspectionTest.java |  43 ++++
 .../MissingScreenshotInspectionTest.java      |   4 +-
 .../MissingScreenshotNameInspectionTest.java  |  42 ++++
 ...ToleranceAboveThresholdInspectionTest.java |   4 +-
 ...PreferredOverScreenshotInspectionTest.java |   4 +-
 ...matchHasNonNumericValueInspectionTest.java |   4 +-
 ...atchOutsideOfBoundariesInspectionTest.java |   4 +-
 ...eenshotCollectorFunctionalTestingTest.java |  78 +++++++
 .../TerraScreenshotReferenceTest.java         |   5 +-
 .../FindUnusedScreenshotsActionTest.java      |  21 +-
 ...ternalFileAndFolderChangeListenerTest.java |   1 +
 ...rraWdioToolWindowFactoryNegativeTest.java} |  18 +-
 .../TerraWdioToolWindowFactoryTest.java       |  77 ++-----
 .../TerraWdioTreeCellRendererTest.java        |  88 --------
 .../TerraWdioTreeNodeRendererTest.java        |  99 +++++++++
 .../toolwindow/TerraWdioTreeNodeTest.java     |  13 +-
 ...otTest.java => TreeModelDataRootTest.java} |  48 +++--
 ...eTest.java => TreeScreenshotNodeTest.java} |  18 +-
 ...pecNodeTest.java => TreeSpecNodeTest.java} |  19 +-
 .../NavigateToScreenshotUsageActionTest.java  |  16 +-
 ...raToolkitScreenshotContextParserTest.java} |  10 +-
 ...eDescribeViewportsBlockInspectionTest.java |   4 +-
 ...eTerraDescribeViewportsInspectionTest.java |   4 +-
 ...ewportsBlocksNotAllowedInspectionTest.java |   4 +-
 ...ortsNotInAscendingOrderInspectionTest.java |   4 +-
 .../NoActualTerraViewportsInspectionTest.java |   4 +-
 .../NonArrayTypeViewportsInspectionTest.java  |   4 +-
 ...dTerraDescribeViewportsInspectionTest.java |   4 +-
 testdata/terra/functestroot/package.json      |   6 +
 .../tests/wdio/CollectScreenshots-spec.js}    |   6 +-
 .../tests/wdio/FindUnusedScreenshot-spec.js}  |   6 +-
 .../terra_screenshot.png                      | Bin 0 -> 119 bytes
 .../terra_screenshot.png                      | Bin 0 -> 119 bytes
 .../terra_screenshot.png                      | Bin 0 -> 119 bytes
 .../terra_screenshot.png                      | Bin 0 -> 119 bytes
 .../terra_screenshot.png                      | Bin 0 -> 119 bytes
 .../DuplicateScreenshotName-spec.js           |  34 +++
 .../InvalidTerraValidationProperties-spec.js  |  47 ++++
 ...onPropertiesTerraFunctionalTesting-spec.js |  39 ++++
 .../screenshot/MandatoryNameParameter-spec.js |  56 +++++
 .../TriplicateScreenshotName-spec.js          |  42 ++++
 .../inspection/wdio/screenshot/package.json   |   6 +
 .../ItValidatesAccessibility-spec.after.js}   |   6 +-
 .../ItValidatesAccessibility-spec.js}         |   8 +-
 ...esAccessibilityWithArguments-spec.after.js |  21 ++
 ...alidatesAccessibilityWithArguments-spec.js |  19 ++
 .../element/ItValidatesElement-spec.after.js  |  21 ++
 .../element/ItValidatesElement-spec.js        |  19 ++
 ...lidatesElementWithArguments-spec.after.js} |   6 +-
 .../ItValidatesElementWithArguments-spec.js   |  19 ++
 ...lidatesElementWithBeforeHook-spec.after.js |  24 +++
 .../ItValidatesElementWithBeforeHook-spec.js} |   8 +-
 ...ookAndDescribeBlockInBetween-spec.after.js |  29 +++
 ...eforeHookAndDescribeBlockInBetween-spec.js |  27 +++
 ...eforeHookAndItBlockInBetween-spec.after.js |  30 +++
 ...tWithBeforeHookAndItBlockInBetween-spec.js |  28 +++
 ...VarInBetweenBeforeHookMerged-spec.after.js |  27 +++
 ...ookAndVarInBetweenBeforeHookMerged-spec.js |  26 +++
 ...InBetweenBeforeHookUnchanged-spec.after.js |  28 +++
 ...AndVarInBetweenBeforeHookUnchanged-spec.js |  26 +++
 ...ementWithBeforeHookUnchanged-spec.after.js |  24 +++
 ...atesElementWithBeforeHookUnchanged-spec.js |  22 ++
 .../ItValidatesElementWithName-spec.after.js  |  21 ++
 .../ItValidatesElementWithName-spec.js        |  19 ++
 ...tesesWithImmediateBeforeHook-spec.after.js |  24 +++
 ...ValidatesesWithImmediateBeforeHook-spec.js |  23 ++
 ...ImmediateBeforeHookUnchanged-spec.after.js |  25 +++
 ...esWithImmediateBeforeHookUnchanged-spec.js |  23 ++
 ...sesWithNoImmediateBeforeHook-spec.after.js |  26 +++
 ...lidatesesWithNoImmediateBeforeHook-spec.js |  24 +++
 .../ItValidatesScreenshot-spec.after.js       |  21 ++
 .../screenshot/ItValidatesScreenshot-spec.js  |  19 ++
 ...datesScreenshotWithArguments-spec.after.js |  21 ++
 ...ItValidatesScreenshotWithArguments-spec.js |  19 ++
 ...tValidatesScreenshotWithName-spec.after.js |  21 ++
 .../ItValidatesScreenshotWithName-spec.js     |  19 ++
 testdata/terra/projectroot/package.json       |   6 +
 .../nameResolution/resolveDefaultName-spec.js |  21 --
 ...DefaultNameForNonDefaultValidation-spec.js |  21 --
 206 files changed, 5108 insertions(+), 1553 deletions(-)
 create mode 100644 assets/replate_terra_it_quick_fix_before_hook_merged.png
 create mode 100644 assets/replate_terra_it_quick_fix_before_hook_unaltered.png
 create mode 100644 assets/replate_terra_it_quick_fix_simple.png
 rename docs/{terra_screenshots.md => terra_helpers.md} (53%)
 create mode 100644 src/main/java/com/picimako/terra/documentation/TerraQuickDocBundle.java
 delete mode 100644 src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationService.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/NoopResourceManager.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/ScreenshotContextParser.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/SpecFolderCollector.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingManager.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingScreenshotContextParser.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/TerraResourceHandlerProvider.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/TerraResourceManager.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/TerraToolkitManager.java
 rename src/main/java/com/picimako/terra/wdio/{imagepreview/ScreenshotContextParser.java => TerraToolkitScreenshotContextParser.java} (50%)
 create mode 100644 src/main/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspection.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/AbstractScreenshotNameResolver.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/ScreenshotNameResolver.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolver.java
 rename src/main/java/com/picimako/terra/wdio/screenshot/{TerraScreenshotNameResolver.java => TerraToolkitScreenshotNameResolver.java} (78%)
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspection.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraValidationPropertiesInspection.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspection.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraFunctionalTestingPropertiesProvider.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraPropertiesProvider.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraToolkitPropertiesProvider.java
 create mode 100644 src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeModel.java
 delete mode 100644 src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTree.java
 delete mode 100644 src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRenderer.java
 rename src/main/java/com/picimako/terra/wdio/toolwindow/{ => node}/AbstractTerraWdioTreeNode.java (72%)
 create mode 100644 src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTree.java
 rename src/main/java/com/picimako/terra/wdio/toolwindow/{ => node}/TerraWdioTreeNode.java (69%)
 rename src/main/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeModelDataRoot.java => node/TreeModelDataRoot.java} (68%)
 rename src/main/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeScreenshotNode.java => node/TreeScreenshotNode.java} (80%)
 rename src/main/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeSpecNode.java => node/TreeSpecNode.java} (76%)
 delete mode 100644 src/main/resources/com/picimako/terra/documentation/terra-wdio-docs.properties
 create mode 100644 src/main/resources/inspectionDescriptions/DuplicateScreenshotName.html
 create mode 100644 src/main/resources/inspectionDescriptions/InvalidTerraValidationProperties.html
 create mode 100644 src/main/resources/inspectionDescriptions/MissingScreenshotName.html
 create mode 100644 src/main/resources/inspectionDescriptions/ReplaceTerraItWithTerraValidates.html
 create mode 100644 src/main/resources/messages/TerraQuickDocBundle.properties
 create mode 100644 src/test/java/com/picimako/terra/TerraFunctionalTestingTestCase.java
 create mode 100644 src/test/java/com/picimako/terra/TerraToolkitTestCase.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingInspectionTestCase.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingSpecFolderCollectorTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/TerraToolkitInspectionTestCase.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/TerraToolkitSpecFolderCollectorTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/imagepreview/TerraFunctionalTestingScreenshotContextParserTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForAccessibilityTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForScreenshotTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolverTest.java
 delete mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolverTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolverTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspectionTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraFTValidationPropertiesInspectionTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraToolkitValidationPropertiesInspectionTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspectionTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotCollectorFunctionalTestingTest.java
 rename src/test/java/com/picimako/terra/{documentation/TerraWdioDocumentationServiceTest.java => wdio/toolwindow/TerraWdioToolWindowFactoryNegativeTest.java} (53%)
 delete mode 100644 src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRendererTest.java
 create mode 100644 src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeRendererTest.java
 rename src/test/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeModelDataRootTest.java => TreeModelDataRootTest.java} (53%)
 rename src/test/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeScreenshotNodeTest.java => TreeScreenshotNodeTest.java} (72%)
 rename src/test/java/com/picimako/terra/wdio/toolwindow/{TerraWdioTreeSpecNodeTest.java => TreeSpecNodeTest.java} (83%)
 rename src/test/java/com/picimako/terra/wdio/toolwindow/action/{ScreenshotContextParserTest.java => TerraToolkitScreenshotContextParserTest.java} (73%)
 create mode 100644 testdata/terra/functestroot/package.json
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveDefaultNameWithTestId-spec.js => functestroot/tests/wdio/CollectScreenshots-spec.js} (78%)
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribeName-spec.js => functestroot/tests/wdio/FindUnusedScreenshot-spec.js} (82%)
 create mode 100644 testdata/terra/functestroot/tests/wdio/__snapshots__/latest/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png
 create mode 100644 testdata/terra/functestroot/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png
 create mode 100644 testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png
 create mode 100644 testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/FindUnusedScreenshot-spec/terra_screenshot.png
 create mode 100644 testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png
 create mode 100644 testdata/terra/inspection/wdio/screenshot/DuplicateScreenshotName-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationProperties-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationPropertiesTerraFunctionalTesting-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/MandatoryNameParameter-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/TriplicateScreenshotName-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/package.json
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveNameWithTestId-spec.js => inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.after.js} (78%)
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribe-spec.js => inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.js} (84%)
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.js
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveNameWithNonMatchingTestId-spec.js => inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.after.js} (78%)
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.after.js
 rename testdata/terra/{projectroot/tests/wdio/nameResolution/resolveNameWithMultipleTestIds-spec.js => inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.js} (76%)
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.after.js
 create mode 100644 testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.js
 create mode 100644 testdata/terra/projectroot/package.json
 delete mode 100644 testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultName-spec.js
 delete mode 100644 testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameForNonDefaultValidation-spec.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04ed41..33c245d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+### 0.6.0
+
+#### ADDED SUPPORT FOR TERRA-FUNCTIONAL-TESTING
+[#53](https://github.com/picimako/terra-support/issues/53): Added support for the new terra-functional-testing npm package that brings
+a couple of changes to how Terra wdio testing is conducted.
+
+Whether terra-functional-testing or terra-toolkit is used is determined by whether `@cerner/terra-functional-testing` or `terra-toolkit`
+is included in the dependencies of the project's root package.json. If none of them is found, plugin features will not execute.
+
+Areas of changes:
+- Updated the screenshot name resolution logic to use only the name argument of `Terra.validates` calls. This affected references, inlay hints,
+  navigation to screenshot usage actions and inspections. See [Terra Upgrade Guide/Screenshots](https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#screenshots).
+- Updated screenshot context string resolution to include the theme in the context string. This affects the reference suggestions and the Diff and Reference/Latest previews.
+- Unused screenshot seeking logic is updated as well.
+- Screenshot gutter icons no longer suggest screenshots when the name argument of a `Terra.validates` call is missing,
+  since it is not a valid usage in terra-functional-testing.
+- Inspections validating mismatch tolerance are updated to handle the renamed `mismatchTolerance` property along with `misMatchTolerance`.
+- Various actions are updated to handle the new theme-specific folder structure.
+- Added an inspection to report when the name parameter of a screenshot validation is missing.
+- Added an inspection to report when more than one screenshot validation has the same name parameter, since these names must be unique.
+
+#### BUGFIX
+- Fixed the disposal logic of the Terra wdio tree nodes.
+
 ### 0.5.1
 
 #### BUGFIX
diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 6444ee5..86e134f 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -4,50 +4,32 @@ If you would like to contribute, first make sure to check out the document about
 
 ## Table of contents
 
-- [Git branching](#git-branching)
-- [How to add new File Templates](#how-to-add-new-file-templates)
 - [Implementing inspections](#implementing-inspections)
     - [Blocking vs. non-blocking inspection types](#blocking-vs-non-blocking-inspection-types)
     - [Steps to implement an inspection](#steps-to-implement-an-inspection)
     - [Unit testing](#unit-testing)
 - [Helper code snippets](#helper-code-snippets)
 
-## Git branching
-
-When you start working on a separate Git branch, please make sure the branch is named according to its purpose as follows:
-
-    <branch_type>/#<issue_number>-<branch_name>
-
-where branch_type may be `feature`, `bugfix` or `doc`, e.g. **feature/#23-add-new-inspection**.
-
-Commit messages doesn't have to contain the issue numbers.
-
-## How to add new File Templates
-
-In order to add File Template under *Settings > Editor > File and Code Template > Files tab*, place your template file under `src/main/resources/fileTemplates`.
-
-The file must be named as follows: `<template name>.<file extension of created file>.ft`, for example for a JavaScript file it could be `Jest test file.js.ft`.
-
 ## Implementing inspections
 
 ### Blocking vs. non-blocking inspection types
 
-Inspections are structured and implemented in a way to have as less duplication and duplicated code execution as possible.
+Inspections are structured and implemented in a way to have as few duplication as possible.
 
-Since severity can only be assigned on a per inspection/implementation class basis (or extension point basis, depending on the viewpoint), inspection implementations are
-separated into **blocking** and **non-blocking** types. (The naming is kind of arbitrary but reflects its purpose. Also, this separation is not a JetBrains standard but is introduced
-here for better performance and maintenance.
+Since severity can only be assigned on an inspection-class (or extension point) basis, inspection implementations are
+separated into **blocking** and **non-blocking** types. (The naming is kind of arbitrary but reflects its purpose. This distinction is not a JetBrains standard but is introduced
+here for better performance and maintenance.)
 
-**Blocking** inspections are registered with `ERROR` severity level in the `plugin.xml`, and each problem registered in the `ProblemsHolder` within the implementation
+**Blocking** inspections are registered with `ERROR` severity level in the `plugin.xml`, and each problem registered in the `ProblemsHolder` 
 is considered a problem that would either cause the test execution not to start, or to fail because in insufficient value was provided that is not considered a valid input.
 
-These classes have their names extended with the word `Blocking`, see e.g. `TerraDescribeViewportsBlockingInspection`.
+These classes have their names postfixed with `Blocking`, e.g. `TerraDescribeViewportsBlockingInspection`.
 
-**Non-blocking** inspections are registered with `WARNING` severity level (or even lower) in the `plugin.xml`, and each problem registered in the `ProblemsHolder` within the implementation
-is considered a problem that would not cause the test execution not to start, or to fail, rather values or construct that would have unintended consequences of the test execution, or might
-mislead users.
+**Non-blocking** inspections are registered with `WARNING` (or lower) severity level. Each problem registered in the `ProblemsHolder`
+is considered a problem that would not cause the test execution not to start, or to fail, rather values or constructs that are not optimal, would have unintended consequences of the test execution,
+or might mislead users.
 
-These classes don't have `Blocking` in their names, see e.g. `TerraDescribeViewportsInspection`.
+These classes don't have `Blocking` in their names, e.g. `TerraDescribeViewportsInspection`.
 
 ### Steps to implement an inspection
 
diff --git a/README.md b/README.md
index 84029c8..0611ac8 100644
--- a/README.md
+++ b/README.md
@@ -34,13 +34,13 @@ for working with Terra screenshots.
 ### Inlay Hints
 
 Inlay Hints are small labels injected into the code, that provide extra (often otherwise invisible) information about the code.
-The [current Inlay Hints](docs/terra_screenshots.md#inlay-hints) for Terra include displaying screenshot names and global Terra CSS selectors.
+The [current Inlay Hints](docs/terra_helpers.md#inlay-hints) for Terra include displaying screenshot names and global Terra CSS selectors.
 
 ## Terra features and settings
 
 You can navigate to further documentation categorized mostly by Terra features.
 
-- [Terra Screenshots](docs/terra_screenshots.md)
+- [Terra Helpers](docs/terra_helpers.md)
 - [Terra Viewports](docs/terra_viewports.md)
 - [Terra UI and components](docs/terra_ui.md)
 - [Terra Wdio Tool Window](docs/terra_wdio_tool_window.md)
diff --git a/assets/replate_terra_it_quick_fix_before_hook_merged.png b/assets/replate_terra_it_quick_fix_before_hook_merged.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ba9d55e2c457ba7d0dbbcadcabc40449f883b75
GIT binary patch
literal 1536
zcmV+b2LJhqP)<h;3K|Lk000e1NJLTq00CP7000vR0ssI2vC%mX00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1(iueK~#8N?O9KY
z9YqlLGZ{(rk-Xg;f~e$_tT_piD7tJ8o+KA{_YeY6y!a+3#XsPi5D-I%2zdd&gCD?y
zXF>82Qr*>4Q(aYEGdu6SWLf(0Bh*ya|L&=-*}QRa=dzDGH!uG6_4$8)JO=;*9)&<f
zMa7wc*AeEsyMNxh@Z#Z{0>FeNAzV>WaR%UZgzvtXiC#c}B_Ui<QE>*~b%ehkyd@d|
z0hWX?$83J%uw6Zmzg2sDZGL(Oiv1?VNx$XM4I#57%;vWjtM+hjceZ!DjD)$$nQLNp
z&_IIQ*pX{T?W(ygn6D8NN;<ya8!6+O`>WOAByZ&CdL7}vU(bm~K!7D7Oo*GYS{$TU
z;qkDew*j-VCoT7y+cOQmQ)hKrv{9?ymklE9_-XC?yjGJ7&atU7j&xUoR*%<k(ct}W
zzP<9^2ZCwB>j?k+P@EB9NeClwI@rdsE5WSnNz1+F_DqBC)LESt?e=nn0pXPmRwo6|
zdUC-zHdV$o?U?E?yp$%j$4{QN4<Ft9<TJt7@H)aDca1+QBA(v8AcPTdKxp=@>jGzo
zIG8`jmXWeL3Nsk|;8cl*5;BaJ59zL=aa3G1?XzdU{M^~3TEx|isa*?*`j*_m<L8$S
zh=wKl=-@k1%0dW}Q|_HyFOQCi$rYXKx@h}Pwmt@?g>SE}iB9wIAjyCLy!I$8UVeTx
zr9@mUr?%nIN?)j;9RQStN8SskDz#r-hb)3((CwHMo=U`C<=$gilEE=$<Qa+J2i?IB
z4VuiPo(>P#?oL8sSc8s$7#tS7j_~P+m;P^!4+mi0+M5euL@6eWJ0%m+Q^~+<gB4_b
z4!4|=M=_`!DyA)AtAtD?3JcdHiBR&sJNd!JRT4*K(Jytv1tJNDFLPm2$#Z6)F<R!D
zLuuLD!P89bIDR%Kez#3PBcf#D3~EJzJX+;cq_0(gKm@bh;aRq6PQihNv@-Q*pTe^e
z=~lCvWZt#Gp)zLbKp;>|1mhUAm_X!rPhe(A5vU^o{9(cC2!NmNye--R;QKG%5n_ZG
zu@RHt8?SmtQ&xfKw<k47_`xAC711&x6R=z(O;GY<-N9Zau{?$-mSv%Z$y85(YZ7LT
zN{V4gM;kf(@FA4esO@lQMC2q>gIWW%wbIuru!<o0{U%<vfldQUuWp4Q=wvPDq?!x{
z?3d9A-U`MxSoX4PvyJBSn!v_7!u6{=q8$L<f7ft{5Ce11AFLgtvCZSZT2}~j+7_@}
zBTaDR<*FrV?nEgI5++kU0W$V0VJmX8=#&6{;Ry0f9W8%5N;D#JlBq#09c?D&rcWw_
zt{~WRfo}FY3%$A(hM+rZd=;$4nhXZ)m(dH}2*x&8^s<7<NOc+89kqkCz8a<hFEj``
zJ;wiQzyy#<8Ja~&0&TN^4UV~`<mJR=D3%4JYm!80`7!Rou!rX_m<`NqRb){X&WRK%
zywYhR@V!J89xZ{I5khN?-Hrl{;N5UgD-wQfRr*SWBjm`w7Zy#L%yW-23_&Bfqr4`g
z0xp-)4qk}`x@@rM1sVj|53BL0;3LQ2Xh0b52-IB&LO>(NorWbm&74UCwpo-&hYl_0
zLo%38ZU86>@=0DWwQB)k&~c~Z3^L)(4@@TuM>x~!J`m_nYg!S+%<Pau7Od~&q|UWQ
zY==z~sP&Ap;BKW(U#p;Gk`GH<%<xFHDuskV&Z0?w3dJ`t@cn?hRkMs*9hpKbqm@CE
zNh;}>;hh1OM_wPoX8!lFqGAlfc`aN`lM&y6tfN)<h^?V-B9k%P5kC6()^EQ*!RY`9
zcoYH^6=BFP+)mQ~7duUt6=M)8wuvpMGeX5_0ev6E@wg5MuLrdwR8&;-s2!oAqM}Fb
m2o)6-J!(g&sHo_$bNMCqOPi~t6qwim0000<MNUMnLSTY&TFC4G

literal 0
HcmV?d00001

diff --git a/assets/replate_terra_it_quick_fix_before_hook_unaltered.png b/assets/replate_terra_it_quick_fix_before_hook_unaltered.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5001f601eb531a4fac022a12cafc91da6ce2cda
GIT binary patch
literal 1526
zcmV<S1qu3zP)<h;3K|Lk000e1NJLTq00CnF000yS0ssI2*YL}G00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1&c{UK~#8N?ODyL
zTtyJ}eP(CGm?4>57ZRelO0HQ6-bB$bS-6sHy!S4GpyI|kt`vX3IYAI5L;{(B@8AQt
za4m?BV0Bk_b#?X6>2vO!AeS1xMNRcrKV8*R(`V*|#bR-EbaeUZs|tleAppYxMg+Wc
zQYaLPBBo4=`?oLu{@KfaeR}}_0=yLjg+g)8Fm6(;4i27ta`E4XFA9JXmIPU$P@Ef#
zn-pJuxD+#j084_bP$<p~#!ZSpzIsUv2m&k#GRJat>$u-Nv#(u$dSmtfy@1^9T%PpW
zp4<|gnXp{l+wA(|!-M7F>DCI_RjxcEmg^2SI7dfrob<cyUVF}a$>fYBnxn#iy}Koc
za8{q&;T$(9{{HcT7!U+l5@dos_q)y7RSMo7dwC9I8#A_BGaZ^b>Om{3)3UWzp)Y%c
z>A3yOHzu~POs3U=a7ObI$nC!TGl%d6JkjB&pMUY%^*4mFf^n1L&u@x%3Rn_k1l}g*
zIF2P``!Tjj`)cYa)Pq)5r)4|e9^pcP-*t^4_La#Q{mfJlay!R1;VuSuH@@14Umrd0
zAO3Xv-S>sQgmIJNw+ES@GZBv;Toh!4y-;*_b5}~dYuF3^GaMzZ1SjSq3NJWqV$hhn
z;Fp!R-C5^oxas<*Pk;E{`=kom)kv9!77$G>g@d;rTv?M0OZ4!<`&Zh9AX88tokDL<
zPD#lPE4%aAhDX1U1G93U>ZB&=Hjmei0|XccNER1h{zd0D;;o3uGqj#ZWMXy{ZxDSF
ztr8Aip#p^{zW(5wchD^*wCK1ZIosBcZ-#9a+GJ>zJ(7l>1f!hv$Oe-F(RjHSH!0qG
z>&icU<^cqhcMeyAj418I*2R5zYzbtC%*P2!#-=9p08Ctmuu|&|I)sMqoUv6xWMau8
zG%*ngzaCCLE^-s6Np=yIJh>n^vU&0sJ`+Ay8X2=?p*a$(d^`9y-I%t&DLB1v6UYe5
z^oN^UMQ-B^xyG6dWfGZ#fIu20>CR8tVNMA`<`x_U^)fmU$2B!c1-^>5z6ixV;womv
zPlDA)aT`IC0?=}~7&j>Z-`#&jj0wQkA6*hOf^9=)CqkbY0bZtB7$KZFH=f}It;!mr
zXGBEEg+`f>@LR({UmY#Z!P25#q-1gx1PD!J7N}%smeOpkhJT_EiB(fODl)=qoGY>F
z+}7(km`P%eOtZvkUd}r#N7?p6wIa_srICl)YB<A1NSc^E3G4<p3bRj&n{QqfV*>E{
zwPK>;;vMwmR{0VH8J~N@({F4m$Xw17a-mTsRQPf=$ISMxv<o7Ws~`X;IUf~6?iPa*
zATFFazSD|Ty&WYPVKvTG%ycIq%`l=3W>VN7AP(o`yu)IY-L^OX+Mu40_goEEX{+HU
zyBJsnO@2~<95EX~V`7%4k7>XW3!QLp?SCJ3ho(KK@x>J-V1?_uP46m#wtVoH49f%=
znwW@`-x3aXTDxhBU6jeO;8KN;y8Di*N3kY6TLKL!L~7OAj)IKfQxe@KlQAg0iEucW
zNq&O~&B$ek#V9a1gnt@yMm7%`<T(k~&{oeMC_=L85}=b{^bo~QkWpy7N)V<@3Yta)
zK}cb%=5AA1N3IOpmc=63^eMV$a)<HF4FH`+J@JJy4J{xXR>Gxu8jhI=Mp@ZKg&bM=
zt1SJFl^OyqyF1j7hth+zdpn{Xd6^LIO?GwDx!*qVpc{R)ef3OIb5sgiBqt8DN-}Ys
zia&v&j9uqxnQ-+pP-_#TrK?7hoCH+z3bbS1e@PXJ7MN2$>5EP=3U(@m;W8_xOp3SP
zx%2ZckMK4D0=yLjg~HsBCw<o`+5tC|=T>CBQz#UQVd$h#C=|ocNuf|EhM|)}p->FN
cO^U_hKN$r01b2{C$^ZZW07*qoM6N<$f*4G)*Z=?k

literal 0
HcmV?d00001

diff --git a/assets/replate_terra_it_quick_fix_simple.png b/assets/replate_terra_it_quick_fix_simple.png
new file mode 100644
index 0000000000000000000000000000000000000000..a15b2e725047472e19fa5cef7ef474cddc79680d
GIT binary patch
literal 1094
zcmV-M1iAZ(P)<h;3K|Lk000e1NJLTq007tk000&U0ssI2Euh7I00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1KUYNK~!i%?VG=E
zQ!x<7`G2y3#8e5GkOCtE0;DP%LTzagEZL}(DoBWhMiB!bB9(SYOGuS8kFgUI3p)~G
zW1tcXTRHpu?%C%bJg0f|4SxCvIrjH_KHtTDsl<gwqtR-$mabe&B+dmWKPW;~h&R>_
z5{Yvm6=I?mL>J=b)2-wFt?z>+02=U-2@;7ph$zIHYx`O6?#b>&26Vy@6DJZ;L=@ty
zXOCG45-`NXi9{3;h4}ULbyj}_3^B1zb9K}iW}oDf4G))B>wA1|4AeU5+3Ss%rXrfF
z<9;^nwD+6s!#&w>j_RFfq}iQ7fHlcTL?Qm%xy<U1fFUL(<hEx0t_l@CcJg)=I1?6|
z#VWG?Pr^<Eqw}p+S`~R&ILBXp+-Xl(XMl)8{PylDt3LvUm>9vcu)1h%oLPxY)qJTv
zBVnh3(fL+eb&RK{rzgMvY`yu+`h7$c;%wXTO9eUFzQ@FfJPs!tu9F{6O1%ECQq|V<
z#C-t|+=;A?;VQv<glsc8IU4o{)7fk~$mh%kV`U{qjZWJ&gC)u54nD50e55uE(alcY
z<!tUKn3$aE-pTb|?~pom!$5TTYK!-xVhx%VzI)hvVu#u3Dh&vhds7tqUR|IN@hN#U
zMik<D`{l3QORNL|=zQ4TW@1Ey=XwRfjZguLEuaKsYBwQUxR21tlL`p{6Wkz`r|v}7
zt1wg>s*Mtci4-%}q(m%z*qv$<x{2zsq9}%Pv8SQLkob(vY3cP&(Z<zku5~OccRKVi
z)hQs~ELDG=CTKHM8Oo>3(HK#P!21^uSQP?;=POJ`$fz6(W&Mr{%iFSn-|TVUJPz@J
zU3MDc%!nayxyCkO>C3vqBng?h1}QV5u*Ec0(E!&Z)*Sf^#gM&P*~7jnLdmU4r6bU0
zs2Y^d;tR3$<Sna0;P#^(CL?_Bh*6QlVF3Gx|Jt@p?A#hd;Bt*^BB1A^E~Si`ufZ1u
ziD{~$0UE0i1BUvv=#&7zP?vh70jtFp;^MF7`M|F)Z2`m#znWzLssgl~^+YT3G3gK0
zPNA*-755qX1>7|$5nErzow%opGh1{Tqbv%)*leh!LM5s5FYHB{=&L2@JAl|$Wz*ql
zGoS>k`mur>jK&Nmu#vH;`vNyn@1$GIAFVi6^%osuLi4T!;0ulYq-UMBYX+Mz;LcvB
z(1?N)oq;F<V#6xGh3UtNZ3r@Fbl5{Pu$MXAi*8jS9qu-x!av_664eo1i1#-~!w>2#
zga&+Mf<$5t(utU;1*s4dwICH@q86k=Ow<CS5ZV7{NhJOoq7WO6zl;b(w;Z`Uh5!Hn
M07*qoM6N<$f(haKnE(I)

literal 0
HcmV?d00001

diff --git a/changelog.html b/changelog.html
index 4227172..2425eb9 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,8 +1,6 @@
-<h4>0.5.1</h4>
+<h4>0.6.0</h4>
 
-<b>Bugfix</b>
+<b>Terra-functional-testing support</b>
 <ul>
-    <li>Fixed an issue with the diff and latest/reference previews due to API changes in IJ 2021.1. It caused the IDE
-    to become unresponsive after opening either of these previews, due to a null value under the hood.</li>
+    <li>Added support for the new terra-functional-testing npm package that is aimed to replace terra-toolkit in the long run.<br>For the detailed list of changes, see the full <a href="https://github.com/picimako/terra-support/blob/master/CHANGELOG.md#060">Changelog</a> on GitHub.</li>
 </ul>
-
diff --git a/docs/terra_screenshots.md b/docs/terra_helpers.md
similarity index 53%
rename from docs/terra_screenshots.md
rename to docs/terra_helpers.md
index 396fc83..c4868d8 100644
--- a/docs/terra_screenshots.md
+++ b/docs/terra_helpers.md
@@ -1,9 +1,11 @@
-# Terra Screenshots
+# Terra Helpers
 
 ## Inspections
 
 ### Terra element validation is preferred over screenshot validation
 
+![](https://img.shields.io/badge/since-0.1.0-blue) [![](https://img.shields.io/badge/implementation-TerraElementValidationIsPreferredOverScreenshotInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java)
+
 This inspection reports problems where either a `Terra.validates.screenshot()` or a `Terra.it.matchesScreenshot()` call is used.
 
 This is based on that some projects might want to/have to incorporate accessibility features and validation in their products. This helps to make sure accessibility issues are caught during automated testing.
@@ -23,12 +25,10 @@ Terra.describeViewports('Test', ['large', 'huge'], () => {
 });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`TerraElementValidationIsPreferredOverScreenshotInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java) | v0.1.0 | 
-
 ### misMatchTolerance value is above a predefined threshold
 
+![](https://img.shields.io/badge/since-0.1.0-blue) [![](https://img.shields.io/badge/implementation-ScreenshotMismatchToleranceInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java)
+
 Although, in some circumstances, specifying the `misMatchTolerance` property may be necessary, it is good practice having a
 threshold as the maximum value allowed for this property, since, quoting the [Terra Webdriver.io Utility Developer's Guide](https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md)
 
@@ -44,12 +44,10 @@ Terra.validates.element({ misMatchTolerance: 23 });
 Terra.validates.element({ misMatchTolerance: 181 });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`ScreenshotMismatchToleranceInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java) | v0.1.0 |
-
 ### misMatchTolerance has negative value or a value greater than 100
 
+![](https://img.shields.io/badge/since-0.1.0-blue) [![](https://img.shields.io/badge/implementation-ScreenshotMismatchToleranceBlockingInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java)
+
 According to the [Terra Webdriver.io Utility Developer's Guide](https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md)
 the value specified in the `misMatchTolerance` property should be a number **between 0 and 100**, thus this inspection is meant to signal values
 that are either negative or greater than 100.
@@ -61,12 +59,10 @@ Terra.validates.element({ misMatchTolerance: -4 });
 Terra.validates.element({ misMatchTolerance: 153 });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`ScreenshotMismatchToleranceBlockingInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java) | v0.1.0 |
-
 ### misMatchTolerance has a non-numeric value defined
 
+![](https://img.shields.io/badge/since-0.1.0-blue) [![](https://img.shields.io/badge/implementation-ScreenshotMismatchToleranceBlockingInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java)
+
 According to the [Terra Webdriver.io Utility Developer's Guide](https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md)
 the value specified in the `misMatchTolerance` property should be a **number** between 0 and 100, thus this inspection is meant to signal values
 that are not numeric ones.
@@ -80,12 +76,10 @@ Terra.validates.element('test case', { misMatchTolerance: { } });
 Terra.validates.element('test case', { misMatchTolerance: false });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`ScreenshotMismatchToleranceBlockingInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java) | v0.1.0 |
-
 ### Missing screenshots
 
+![](https://img.shields.io/badge/since-0.2.0-blue) [![](https://img.shields.io/badge/implementation-MissingScreenshotInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java)
+
 When an image, referenced by `Terra.it` and `Terra.validates` calls, doesn't exist for any context (locale, browser, viewport),
 this inspection marks either the name parameter of such calls, or if they are missing (and the default value `default` is used),
 then marks the function call's name element.
@@ -112,12 +106,10 @@ Terra.describeViewports('viewports', ['medium'], () => {
 });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`MissingScreenshotInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java) | v0.2.0 |
-
 ### Screenshot selector matches Terra global selector
 
+![](https://img.shields.io/badge/since-0.2.0-blue) [![](https://img.shields.io/badge/implementation-GlobalTerraSelectorInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java)
+
 Terra-toolkit provides various config options for wdio test execution that can be defined in the project's wdio.conf.js.
 One of these properties is `terra.selector` in which a global/default CSS selector can be specified for capturing screenshots
 when no CSS selector is specified explicitly in a test.
@@ -143,11 +135,114 @@ Terra.validates.element('an element', { selector: '#selector' }); // #selector
 Terra.validates.element('an element'); // #global-selector
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`GlobalTerraSelectorInspection`](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java) | v0.2.0 |
+### Invalid Terra validation properties
+
+![](https://img.shields.io/badge/since-0.6.0-blue) [![](https://img.shields.io/badge/implementation-InvalidTerraValidationPropertiesInspection-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraValidationPropertiesInspection.java)
+
+This inspection reports JS properties of `Terra.it` and `Terra.validates` helpers, that are not applicable to the particular helpers.
+
+It handles both terra-toolkit and terra-functional-testing specific properties based on which library is used in the project.
+
+**Valid properties**
+
+| Helpers | terra-toolkit | terra-functional-testing |
+|---|---|---|
+| `Terra.it.matchesScreenshot`/`validates.screenshot` | `misMatchTolerance`, `selector`, `viewports` | `mismatchTolerance`, `selector` |
+| `Terra.it.validatesElement`/`validates.element` | `misMatchTolerance`, `selector`, `axeRules` | `mismatchTolerance`, `selector`, `rules` |
+| `Terra.it.isAccessible`/`validates.accessibility` | `axeRules` | `rules` |
+
+### Convert Terra.it helpers to Terra.validates
+
+![](https://img.shields.io/badge/since-0.6.0-blue) [![](https://img.shields.io/badge/implementation-ReplaceTerraItWithTerraValidatesInspection-blue)](../src/main/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspection.java)
+
+Since Terra.it is deprecated in terra-toolkit, and is no longer available in terra-functional-testing, it is recommended to migrate Terra.it helper usage
+to their Terra.validates forms.
+
+This inspection reports usages of `Terra.it` helpers, and provides various quick fixes to replace them.
+
+#### Without a preceding before hook
+In its simplest form, if there is no `before` hook **directly** before the particular Terra.it helper, there is only one quick fix suggested, called
+![replate_terra_it_quick_fix_simple](../assets/replate_terra_it_quick_fix_simple.png). The conversion would be as follows:
+
+```js
+// This
+Terra.it.validatesElement('name', { selector: '#selector', misMatchTolerance: 0.5 });
+
+// becomes this
+it('INSERT TEST NAME', () => {
+    Terra.validates.element('name', {selector: '#selector', misMatchTolerance: 0.5});
+});
+```
+
+#### With a direct preceding before hook
+
+If there is a before hook directly preceding a Terra.it helper, then two quick fixes are suggested: one behaves the same as in the previous section,
+is called ![replate_terra_it_quick_fix_before_hook_unaltered](../assets/replate_terra_it_quick_fix_before_hook_unaltered.png), and it doesn't touch the before hook,
+simply converts the helper. The other one is called ![replate_terra_it_quick_fix_before_hook_merged](../assets/replate_terra_it_quick_fix_before_hook_merged.png), but in that case the before hook and the converted helper
+it merged: basically everything from the before hook's callback is moved to the new `it` block.
+
+```js
+//This
+before(() => {
+    browser.url('/');
+    browser.url('/?param=value');
+});
+Terra.it.validatesElement('test name', { selector: '#selector' });
+
+//becomes this
+it('INSERT TEST NAME', () => {
+    browser.url('/');
+    browser.url('/?param=value');
+    Terra.validates.element('test name', {selector: '#selector'});
+});
+```
 
-## References
+### Missing screenshot names
+
+![](https://img.shields.io/badge/since-0.6.0-blue) [![](https://img.shields.io/badge/implementation-TerraScreenshotReferenceContributor-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspection.java)
+
+The documentation of Terra Functional Testing says that screenshot name parameters in `Terra.validates.screenshot` and `Terr.validates.element`
+are mandatory. If they are missing, test execution will fail with a specific error. There is no change in terra-toolkit regarding this rule.
+
+See [Terra Commands](https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#terra-commands) and [Screenshots](https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#screenshots) sections in the upgrade guide.
+
+**Example:**
+
+```js
+Terra.validates.screenshot();
+Terra.validates.element({ mismatchTolerance: 0.5 });
+```
+
+### Duplicate screenshot names
+
+![](https://img.shields.io/badge/since-0.6.0-blue) [![](https://img.shields.io/badge/implementation-TerraScreenshotReferenceContributor-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspection.java)
+
+Based on the Terra Functional Testing documentation each screenshot validation in a wdio spec file has to define a unique name,
+no two names are allowed to be equal.
+
+See [Screenshots](https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#screenshots) section in the upgrade guide.
+
+**Example:**
+
+```js
+Terra.describeViewports('Terra', ['tiny', 'small'], () => {
+   it('', () => {
+        Terra.validates.screenshot('duplicate name');
+   });
+
+    it('', () => {
+        Terra.validates.screenshot('unique name');
+    });
+
+    it('', () => {
+        Terra.validates.element('duplicate name');
+    });
+});
+```
+
+## Screenshot references
+
+![](https://img.shields.io/badge/since-0.2.0-blue) [![](https://img.shields.io/badge/implementation-TerraScreenshotReferenceContributor-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java)
 
 By invoking one of the "Go to declaration" shortcuts on the first, String parameter of screenshot validation function calls, you can navigate to the
 `reference` version of the referenced image, or images when there are multiple ones with the same name but different contexts.
@@ -183,7 +278,7 @@ describe('terra screenshot', () => {
 });
 ```
 
-A set of characters are replaced, so that characters reserved by operating systems will not be used in file names:
+A set of characters is replaced, so that characters reserved by operating systems will not be used in file names:
 - any whitespace, the dot (.) and + characters are replaced with an underscore (_)
 - ?, <, >, /, |, *, :, " characters are replaced with a hyphen (-)
 - also, the starting and ending whitespaces are trimmed separately both in the first part of the screenshot name, and in
@@ -198,16 +293,15 @@ Terra.it.matchesScreenshot({ selector: '#root' });
 Terra.it.validatesElement({ selector: '#root' });
 ```
 
-| Implementation class | Introduced in |
-|---|---|
-| [`TerraScreenshotReferenceContributor`](../src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java) | v0.2.0 |
-
 ## Quick Documentation
 
-### Terra WDIO objects and functions
+### Terra WDIO helpers and functions
 
-There are a few external documentations on GitHub that are useful for Terra wdio testing. Currently these are:
+![](https://img.shields.io/badge/since-0.1.0-blue) [![](https://img.shields.io/badge/implementation-TerraWdioDocumentationProvider-blue)](../src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java)
+
+There are a few external documentations on GitHub that are useful for Terra wdio testing. The follow ones are provided to users:
 - [Webdriver.io Utility Developer's Guide](https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md)
+- [Terra Functional Testing](https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about)
 - [Axe Accessibility Rule Descriptions](https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md)
 
 To make them easily available, they are included in the Quick Documentation popup of each Terra object and function name that are related to wdio testing.
@@ -218,12 +312,10 @@ When there are multiple documentations e.g. for `validatesElement()` that includ
 
 ![terra-wdio-quick-documentation-multiple](../assets/terra-wdio-quick-documentation-multiple.png)
 
-| Implementation class | Introduced in |
-|---|---|
-| [`TerraWdioDocumentationProvider`](../src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java) | v0.1.0 |
-
 ## Line markers / Gutter icons
 
+![](https://img.shields.io/badge/since-0.4.0-blue) [![](https://img.shields.io/badge/implementation-TerraScreenshotValidationLineMarkerProvider-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java)
+
 To complement the logic provided by the Terra screenshot reference contributor, and to provide visual clues about where in a spec file
 screenshot validations are actually present, there are line markers added for each Terra screenshot validation call.
 
@@ -249,12 +341,10 @@ Line markers can also be enabled/disabled under `Settings > Editor > General > G
 
 ![gutter_icon_settings](../assets/terra_gutter_icon_settings.PNG)
 
-| Implementation class | Introduced in |
-|---|---|
-| [`TerraScreenshotValidationLineMarkerProvider`](../src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java) | v0.4.0 |
-
 ## Navigation from screenshot to code
 
+![](https://img.shields.io/badge/since-0.5.0-blue) [![](https://img.shields.io/badge/implementation-NavigateToScreenshotUsageProjectViewAction-blue)](../src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java)
+
 An action called **Navigate to Screenshot Usage** is added to the Project View context menu of image files within `__snapshots__` folders.
 
 From end-user perspective it works the same way the [**Navigate to Usage**](../docs/terra_wdio_tool_window.md#actions) action works in the Terra wdio tool window,
@@ -262,12 +352,10 @@ it is just an alternate location to jump to where a particular image is referenc
 
 ![navigate_to_screenshot_usage_action](../assets/terra-wdio-navigate-to-screenshot-usage-action.png)
 
-| Implementation class | Introduced in |
-|---|---|
-| [`NavigateToScreenshotUsageProjectViewAction`](../src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java) | v0.5.0 |
-
 ## Inlay Hints
 
+![](https://img.shields.io/badge/since-0.5.0-blue) [![](https://img.shields.io/badge/implementation-NavigateToScreenshotUsageProjectViewAction-blue)](../src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt)
+
 There are two hints provided for screenshot validation calls: screenshot names and global CSS selectors.
 
 As for screenshot names, it is the referenced image name resolved and displayed (regardless of it exists or not), while for the CSS selector, it is displayed only
@@ -279,7 +367,3 @@ Within the IDE `Settings > Editor > Inlay Hints > JavaScript > Terra screenshot`
 They are either **Disabled**, or enabled as **Block** (hints shown above the call's line) or **Inline** (hints shown at the end of the call's line) style.
 
 ![inlay_hints](../assets/terra_wdio_inlay_hints.PNG)
-
-| Implementation class | Introduced in |
-|---|---|
-| [`NavigateToScreenshotUsageProjectViewAction`](../src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt) | v0.5.0 |
diff --git a/docs/terra_wdio_tool_window.md b/docs/terra_wdio_tool_window.md
index 73e1ea5..826e4f2 100644
--- a/docs/terra_wdio_tool_window.md
+++ b/docs/terra_wdio_tool_window.md
@@ -113,6 +113,9 @@ Spec nodes are also highlighted with bold text when at least one of the underlyi
 
 ![highlighted_nodes](../assets/terra_wdio_tool_window_highlighted_nodes.PNG)
 
+You can also search in the tool window. Just start typing the search keyword when the tool window is in focus. Just like in the IDE Project View, the matching
+nodes and texts get highlighted. 
+
 ## Statistics
 
 All three node types provide basic statistics about the number of specs and screenshots available in the project.
diff --git a/src/main/java/com/picimako/terra/FileTypePreconditions.java b/src/main/java/com/picimako/terra/FileTypePreconditions.java
index 00d93ed..6f8acd5 100644
--- a/src/main/java/com/picimako/terra/FileTypePreconditions.java
+++ b/src/main/java/com/picimako/terra/FileTypePreconditions.java
@@ -20,6 +20,7 @@
 
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -37,7 +38,7 @@ public final class FileTypePreconditions {
     private static final String NON_TEST_JSX_PATTERN = ".*(?<!\\.test)\\.jsx$";
 
     /**
-     * Validates whether the argument element is in a non-test React JSX file, as in its name ends with {@code .jsx} but
+     * Returns whether the argument element is in a non-test React JSX file, as in its name ends with {@code .jsx} but
      * not with {@code .test.jsx}.
      *
      * @param element the Psi element to check
@@ -48,7 +49,7 @@ public static boolean isInAppJsxFile(@NotNull PsiElement element) {
     }
 
     /**
-     * Validates whether the argument element is in a wdio spec file, as in its name ends with one of the following:
+     * Returns whether the argument element is in a wdio spec file, as in its name ends with one of the following:
      * -spec.js, -spec.jsx or -spec.ts.
      *
      * @param element the Psi element to check
@@ -58,6 +59,17 @@ public static boolean isInWdioSpecFile(@NotNull PsiElement element) {
         return element.getContainingFile().getName().matches(WDIO_SPEC_FILE_NAME_PATTERN);
     }
 
+    /**
+     * Returns whether the argument file is a wdio spec file, as in its name ends with one of the following:
+     * -spec.js, -spec.jsx or -spec.ts.
+     *
+     * @param file the Psi file to check
+     * @return true if it is a wdio spec file, false otherwise
+     */
+    public static boolean isWdioSpecFile(PsiFile file) {
+        return file.getName().matches(WDIO_SPEC_FILE_NAME_PATTERN);
+    }
+
     private FileTypePreconditions() {
         //Utility class
     }
diff --git a/src/main/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProvider.java b/src/main/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProvider.java
index 3593abd..c2ea2cf 100644
--- a/src/main/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProvider.java
+++ b/src/main/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProvider.java
@@ -25,8 +25,10 @@
 import static com.intellij.lang.documentation.DocumentationMarkup.SECTION_END;
 import static com.intellij.lang.documentation.DocumentationMarkup.SECTION_HEADER_START;
 import static com.intellij.lang.documentation.DocumentationMarkup.SECTION_SEPARATOR;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
 import static com.picimako.terra.psi.js.JSLiteralExpressionUtil.getStringValue;
 import static com.picimako.terra.psi.js.JSLiteralExpressionUtil.isJSStringLiteral;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_DESCRIBE_VIEWPORTS;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.isSupportedViewport;
 
@@ -51,12 +53,12 @@ public final class TerraDescribeViewportsDocumentationProvider implements Docume
      * <a href="https://engineering.cerner.com/terra-ui/components/terra-breakpoints/breakpoints/about#breakpoints">Terra Breakpoints documentation</a>.
      */
     private static final Map<String, Breakpoint> BREAKPOINTS = Map.of(
-            "tiny", new Breakpoint("0px", "@media screen and (min-width: 0px)", "Active from viewport width 0px and up"),
-            "small", new Breakpoint("544px", "@media screen and (min-width: 544px)", "Active from viewport width 544px and up"),
-            "medium", new Breakpoint("768px", "@media screen and (min-width: 768px)", "Active from viewport width 768px and up"),
-            "large", new Breakpoint("992px", "@media screen and (min-width: 992px)", "Active from viewport width 992px and up"),
-            "huge", new Breakpoint("1216px", "@media screen and (min-width: 1216px)", "Active from viewport width 1216px and up"),
-            "enormous", new Breakpoint("1440px", "@media screen and (min-width: 1440px)", "Active from viewport width 1440px and up"));
+        "tiny", new Breakpoint("0px", "@media screen and (min-width: 0px)", "Active from viewport width 0px and up"),
+        "small", new Breakpoint("544px", "@media screen and (min-width: 544px)", "Active from viewport width 544px and up"),
+        "medium", new Breakpoint("768px", "@media screen and (min-width: 768px)", "Active from viewport width 768px and up"),
+        "large", new Breakpoint("992px", "@media screen and (min-width: 992px)", "Active from viewport width 992px and up"),
+        "huge", new Breakpoint("1216px", "@media screen and (min-width: 1216px)", "Active from viewport width 1216px and up"),
+        "enormous", new Breakpoint("1440px", "@media screen and (min-width: 1440px)", "Active from viewport width 1440px and up"));
 
     /**
      * Actual documentation is built only for those String literals that are defined in the second argument of {@code Terra.describeViewports}
@@ -65,12 +67,15 @@ public final class TerraDescribeViewportsDocumentationProvider implements Docume
     @Nullable
     @Override
     public String generateDoc(PsiElement element, @Nullable PsiElement originalElement) {
-        if (isJSStringLiteral(element)
-                && element.getParent() instanceof JSArrayLiteralExpression
-                && element.getParent().getParent() instanceof JSArgumentList
-                && element.getParent().getParent().getPrevSibling() instanceof JSReferenceExpression
-                && TERRA_DESCRIBE_VIEWPORTS.equals(((JSReferenceExpression) element.getParent().getParent().getPrevSibling()).getCanonicalText())
-                && isSupportedViewport(getStringValue(element))) {
+        if (element != null
+            && isUsingTerra(element.getProject())
+            && isWdioSpecFile(element.getContainingFile())
+            && isJSStringLiteral(element)
+            && element.getParent() instanceof JSArrayLiteralExpression
+            && element.getParent().getParent() instanceof JSArgumentList
+            && element.getParent().getParent().getPrevSibling() instanceof JSReferenceExpression
+            && TERRA_DESCRIBE_VIEWPORTS.equals(((JSReferenceExpression) element.getParent().getParent().getPrevSibling()).getCanonicalText())
+            && isSupportedViewport(getStringValue(element))) {
             return buildDocumentation(getStringValue(element));
         }
         return null;
@@ -78,13 +83,13 @@ && isSupportedViewport(getStringValue(element))) {
 
     private String buildDocumentation(String viewport) {
         return DEFINITION_START + viewport + DEFINITION_END
-                + CONTENT_START
-                + SECTIONS_START
-                + SECTION_HEADER_START + "Minimum value: " + SECTION_SEPARATOR + BREAKPOINTS.get(viewport).minimumValue + SECTION_SEPARATOR + SECTION_END
-                + SECTION_HEADER_START + "Media Query: " + SECTION_SEPARATOR + "<code>" + BREAKPOINTS.get(viewport).mediaQuery + "</code>" + SECTION_END
-                + SECTION_HEADER_START + "Description: " + SECTION_SEPARATOR + BREAKPOINTS.get(viewport).description + SECTION_END
-                + SECTIONS_END
-                + CONTENT_END;
+            + CONTENT_START
+            + SECTIONS_START
+            + SECTION_HEADER_START + "Minimum value: " + SECTION_SEPARATOR + BREAKPOINTS.get(viewport).minimumValue + SECTION_SEPARATOR + SECTION_END
+            + SECTION_HEADER_START + "Media Query: " + SECTION_SEPARATOR + "<code>" + BREAKPOINTS.get(viewport).mediaQuery + "</code>" + SECTION_END
+            + SECTION_HEADER_START + "Description: " + SECTION_SEPARATOR + BREAKPOINTS.get(viewport).description + SECTION_END
+            + SECTIONS_END
+            + CONTENT_END;
     }
 
     private static final class Breakpoint {
diff --git a/src/main/java/com/picimako/terra/documentation/TerraQuickDocBundle.java b/src/main/java/com/picimako/terra/documentation/TerraQuickDocBundle.java
new file mode 100644
index 0000000..113bed3
--- /dev/null
+++ b/src/main/java/com/picimako/terra/documentation/TerraQuickDocBundle.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.documentation;
+
+import com.intellij.DynamicBundle;
+import org.jetbrains.annotations.Nls;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.PropertyKey;
+
+/**
+ * Resource bundle for quick documentation related messages.
+ *
+ * @since 0.6.0
+ */
+public class TerraQuickDocBundle extends DynamicBundle {
+
+    @NonNls
+    private static final String TERRA_QUICK_DOC_BUNDLE = "messages.TerraQuickDocBundle";
+    private static final TerraQuickDocBundle INSTANCE = new TerraQuickDocBundle();
+
+    private TerraQuickDocBundle() {
+        super(TERRA_QUICK_DOC_BUNDLE);
+    }
+
+    public static @Nls String message(@NotNull @PropertyKey(resourceBundle = TERRA_QUICK_DOC_BUNDLE) String key, Object @NotNull ... params) {
+        return INSTANCE.getMessage(key, params);
+    }
+}
diff --git a/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java b/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java
index 2ba3e14..d4d2c77 100644
--- a/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java
+++ b/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationProvider.java
@@ -19,38 +19,32 @@
 import static com.intellij.lang.documentation.DocumentationMarkup.CONTENT_END;
 import static com.intellij.lang.documentation.DocumentationMarkup.CONTENT_START;
 import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.isAnyOfTerraWdioFunctions;
 import static java.util.stream.Collectors.joining;
 
 import java.util.Arrays;
-import java.util.Properties;
 
 import com.intellij.lang.javascript.documentation.JavaScriptDocumentationProvider;
-import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.picimako.terra.wdio.TerraResourceManager;
+
 /**
  * Provides external documentation links for Terra wdio objects and functions in Terra wdio spec files.
  * <p>
  * The links are added in addition to the original documentation content what their Quick Documentation popup provides,
  * which could be achieved by having this class extended from {@link JavaScriptDocumentationProvider}.
- * <p>
- * Documentation URLs are handled by an
- * <a href="https://jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_services.html#light-services">application service</a>
- * because application services are initialized only when they are first queried from the {@link ServiceManager}, after that each further
- * query will return the same object.
- * <p>
- * Thus, the documentation URLs are loaded only when the Quick Documentation popup is first triggered, and each further trigger of it
- * will retrieve the data from the already loaded, underlying service-provided object.
  *
+ * @see TerraQuickDocBundle
  * @since 0.1.0
  */
 public class TerraWdioDocumentationProvider extends JavaScriptDocumentationProvider {
 
     private static final String HTML_LINK = "<a href=\"%s\">%s</a>";
-    private Properties documentation;
 
     /**
      * {@inheritDoc}
@@ -61,10 +55,8 @@ public class TerraWdioDocumentationProvider extends JavaScriptDocumentationProvi
     @Nullable
     @Override
     public String generateDoc(PsiElement element, @Nullable PsiElement originalElement) {
-        if (originalElement != null && isInWdioSpecFile(originalElement) && isAnyOfTerraWdioFunctions(originalElement)) {
-            if (documentation == null) {
-                documentation = loadDocumentation();
-            }
+        if (originalElement != null && isUsingTerra(originalElement.getProject())
+            && isInWdioSpecFile(originalElement) && isAnyOfTerraWdioFunctions(originalElement)) {
             return super.generateDoc(element, originalElement) + generateDocLinks(originalElement);
         }
         return null;
@@ -76,13 +68,9 @@ public String generateDoc(PsiElement element, @Nullable PsiElement originalEleme
      * Each entry in the source properties file may have one or more links separated by commas, and the text and URL
      * parts of each links separated by pipe (|) characters.
      * <p>
-     * One example may be (using custom placeholders for common values):
-     * <pre>
-     * Terra.it.isAccessible={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-     * </pre>
      * Extra trimming and blank/empty string checking is not included here, since the source content is not dynamic.
      * <p>
-     * When adding entries into {@code terra-wdio-docs.properties}, please make sure that they are added as non-blank,
+     * When adding entries into {@code TerraQuickDocBundle.properties}, please make sure that they are added as non-blank,
      * trimmed values.
      *
      * @param originalElement the element to show the documentation popup for
@@ -90,28 +78,13 @@ public String generateDoc(PsiElement element, @Nullable PsiElement originalEleme
      */
     @NotNull
     private String generateDocLinks(PsiElement originalElement) {
-        String terraElementText = originalElement.getParent().getText();
-        String[] links = documentation.getProperty(terraElementText).split(",");
+        String[] links = TerraQuickDocBundle.message(libraryPrefix(originalElement.getProject()) + originalElement.getParent().getText()).split(",");
         return CONTENT_START + Arrays.stream(links)
-                .map(link -> {
-                    String[] linkProps = link.split("\\|");
-                    return String.format(HTML_LINK, resolvePlaceholders(linkProps[1]), resolvePlaceholders(linkProps[0]));
-                }).collect(joining("<br>")) + CONTENT_END;
-    }
-
-    private Properties loadDocumentation() {
-        return ServiceManager.getService(TerraWdioDocumentationService.class).getDocs();
+            .map(link -> String.format(HTML_LINK, TerraQuickDocBundle.message(link + ".url"), TerraQuickDocBundle.message(link + ".label")))
+            .collect(joining("<br>")) + CONTENT_END;
     }
 
-    /**
-     * To shorten and simplify the content of the source properties file, it incorporates some custom placeholders for
-     * common values which are resolved by this method.
-     *
-     * @param link the link to resolve the placeholders in
-     * @return the link having the placeholders replaced in it
-     */
-    private String resolvePlaceholders(String link) {
-        return link.replace("{terra}", "Webdriver.io Utility Developer's Guide")
-                .replace("{wdioutil}", "https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md");
+    private String libraryPrefix(Project project) {
+        return TerraResourceManager.isUsingTerraToolkit(project) ? "tt." : "tft.";
     }
 }
diff --git a/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationService.java b/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationService.java
deleted file mode 100644
index bfb1ec7..0000000
--- a/src/main/java/com/picimako/terra/documentation/TerraWdioDocumentationService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.picimako.terra.documentation;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import com.intellij.openapi.components.Service;
-
-/**
- * Application Service to load and provide documentation links for Terra wdio functions and objects.
- *
- * @see com.picimako.terra.documentation.TerraWdioDocumentationProvider
- */
-@Service
-public final class TerraWdioDocumentationService {
-
-    private Properties docs;
-
-    public TerraWdioDocumentationService() {
-        try {
-            docs = new Properties();
-            docs.load(getClass().getResourceAsStream("terra-wdio-docs.properties"));
-        } catch (IOException e) {
-            e.printStackTrace();
-            docs = null;
-        }
-    }
-
-    Properties getDocs() {
-        return docs;
-    }
-}
diff --git a/src/main/java/com/picimako/terra/psi/js/JSArgumentUtil.java b/src/main/java/com/picimako/terra/psi/js/JSArgumentUtil.java
index d0fcf1f..495775e 100644
--- a/src/main/java/com/picimako/terra/psi/js/JSArgumentUtil.java
+++ b/src/main/java/com/picimako/terra/psi/js/JSArgumentUtil.java
@@ -18,9 +18,11 @@
 
 import static com.intellij.lang.javascript.buildTools.JSPsiUtil.getCallExpression;
 
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import com.intellij.lang.javascript.psi.JSArgumentList;
+import com.intellij.lang.javascript.psi.JSArgumentsHolder;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -34,7 +36,17 @@
  */
 public final class JSArgumentUtil {
 
-    private static final JSExpression[] EMPTY_ARGUMENTS = new JSExpression[0];
+    /**
+     * Gets the argument list of the provided statement.
+     *
+     * @param element the element to get the argument list of
+     * @return the argument list, or null if there is none
+     */
+    @Nullable
+    public static JSArgumentList getArgumentListOf(JSExpressionStatement element) {
+        JSCallExpression jsCallExpression = getCallExpression(element);
+        return jsCallExpression != null ? jsCallExpression.getArgumentList() : null;
+    }
 
     /**
      * Gets the arguments of the provided statement.
@@ -46,14 +58,7 @@ public final class JSArgumentUtil {
      */
     @NotNull
     public static JSExpression[] getArgumentsOf(JSExpressionStatement element) {
-        JSCallExpression jsCallExpression = getCallExpression(element);
-        if (jsCallExpression != null) {
-            JSArgumentList argumentList = jsCallExpression.getArgumentList();
-            if (argumentList != null) {
-                return argumentList.getArguments();
-            }
-        }
-        return EMPTY_ARGUMENTS;
+        return Optional.ofNullable(getArgumentListOf(element)).map(JSArgumentsHolder::getArguments).orElse(JSExpression.EMPTY_ARRAY);
     }
 
     /**
diff --git a/src/main/java/com/picimako/terra/resources/TerraBundle.java b/src/main/java/com/picimako/terra/resources/TerraBundle.java
index f350194..aa0eada 100644
--- a/src/main/java/com/picimako/terra/resources/TerraBundle.java
+++ b/src/main/java/com/picimako/terra/resources/TerraBundle.java
@@ -45,8 +45,8 @@ private TerraBundle() {
      * @param id the suffix of the message key
      * @return the actual message
      */
-    public static String inspection(@NonNls String id) {
-        return message("terra.inspection." + id);
+    public static String inspection(@NonNls String id, Object @NotNull ... params) {
+        return message("terra.inspection." + id, params);
     }
 
     /**
@@ -55,8 +55,8 @@ public static String inspection(@NonNls String id) {
      * @param id the suffix of the message key
      * @return the actual message
      */
-    public static String toolWindow(@NonNls String id) {
-        return message("terra.wdio.toolwindow." + id);
+    public static String toolWindow(@NonNls String id, Object @NotNull ... params) {
+        return message("terra.wdio.toolwindow." + id, params);
     }
 
     /**
diff --git a/src/main/java/com/picimako/terra/wdio/NoopResourceManager.java b/src/main/java/com/picimako/terra/wdio/NoopResourceManager.java
new file mode 100644
index 0000000..fc81a30
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/NoopResourceManager.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.inspection.TerraPropertiesProvider;
+
+/**
+ * No-operation resource manager to use when there is no terra-toolkit or terra-functional-testing depencency in the
+ * project's root package.json, or there is no root package.json at all.
+ */
+@Service
+public final class NoopResourceManager extends TerraResourceManager {
+
+    //Required for project service creation
+    public NoopResourceManager(Project project) {
+    }
+
+    @Override
+    public ScreenshotNameResolver screenshotNameResolver() {
+        return new ScreenshotNameResolver() {
+            @Override
+            public @Nullable String resolveName(JSLiteralExpression element) {
+                return null;
+            }
+
+            @Override
+            public @Nullable String resolveDefaultName(JSExpression methodExpression) {
+                return null;
+            }
+
+            @Override
+            public @Nullable String resolveWithFallback(@Nullable JSLiteralExpression firstNameArgument, JSExpression methodExpression) {
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser() {
+        return new ScreenshotContextParser() {
+            @Override
+            public String parse(@NotNull String filePath) {
+                return null;
+            }
+        };
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser(String contextSeparator) {
+        return screenshotContextParser();
+    }
+
+    @Override
+    public SpecFolderCollector specFolderCollector() {
+        return dir -> null;
+    }
+
+    @Override
+    public TerraPropertiesProvider screenshotValidationProperties() {
+        return new TerraPropertiesProvider() {
+            @Override
+            public List<String> screenshotProperties() {
+                return Collections.emptyList();
+            }
+
+            @Override
+            public List<String> elementProperties() {
+                return Collections.emptyList();
+            }
+
+            @Override
+            public List<String> accessibilityProperties() {
+                return Collections.emptyList();
+            }
+        };
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/ScreenshotContextParser.java b/src/main/java/com/picimako/terra/wdio/ScreenshotContextParser.java
new file mode 100644
index 0000000..33a4aee
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/ScreenshotContextParser.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Takes a screenshot file's path and retrieves the context information from it.
+ */
+public abstract class ScreenshotContextParser {
+
+    protected static final String CONTEXT_SEPARATOR = " / ";
+    protected static final String PATH_DELIMITER = "/";
+    protected String contextSeparator = CONTEXT_SEPARATOR;
+
+    public ScreenshotContextParser() {
+    }
+
+    public ScreenshotContextParser(String contextSeparator) {
+        this.contextSeparator = contextSeparator;
+    }
+
+    /**
+     * Parses the context information (theme, locale, browser, viewport) from the provided path.
+     *
+     * @param filePath the screenshot's file path to process
+     * @return the context information
+     */
+    public abstract String parse(@NotNull String filePath);
+}
diff --git a/src/main/java/com/picimako/terra/wdio/SpecFolderCollector.java b/src/main/java/com/picimako/terra/wdio/SpecFolderCollector.java
new file mode 100644
index 0000000..81ceacf
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/SpecFolderCollector.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Collects spec folders based on image type.
+ */
+@FunctionalInterface
+public interface SpecFolderCollector {
+
+    /**
+     * Retrieves the folder type based on the {@code [type]/locale/browser_viewport/spec} folder structure.
+     */
+    SpecFolderCollector TERRA_TOOLKIT_SPEC_COLLECTOR = dir -> dir.getParent().getParent().getParent().getName();
+    /**
+     * Retrieves the folder type based on the {@code [type]/theme/locale/browser_viewport/spec} folder structure.
+     */
+    SpecFolderCollector TERRA_FUNCTIONAL_TESTING_SPEC_COLLECTOR = dir -> dir.getParent().getParent().getParent().getParent().getName();
+
+    /**
+     * Collect spec folders from within the provided set of files and folders (effectively everything from) the wdio
+     * test root, filtered by the provided {@code imageType} folder (diff, latest or reference),
+     * and return it as a {@link Stream} for further manipulation.
+     *
+     * @param imageType                 the image type folder to collect the spec folders from
+     * @param filesAndFoldersInWdioRoot the list of files and folders inside the wdio test root
+     * @return the stream of matching spec folders
+     */
+    @NotNull
+    default Stream<VirtualFile> collectSpecFoldersForTypeInside(@NotNull String imageType, @NotNull List<VirtualFile> filesAndFoldersInWdioRoot) {
+        return filesAndFoldersInWdioRoot.stream()
+            .filter(VirtualFile::isDirectory)
+            .filter(dir -> dir.getName().endsWith("-spec"))
+            .filter(dir -> imageType.equals(getFolderType(dir)));
+    }
+
+    /**
+     * Returns in which image type the argument folder is located: diff, latest, reference.
+     */
+    String getFolderType(VirtualFile dir);
+}
diff --git a/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingManager.java b/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingManager.java
new file mode 100644
index 0000000..f0834bd
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingManager.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import java.util.Optional;
+
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.project.Project;
+
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.TerraFunctionalTestingScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.inspection.TerraPropertiesProvider;
+import com.picimako.terra.wdio.screenshot.inspection.TerraFunctionalTestingPropertiesProvider;
+
+/**
+ * Provides terra-functional-testing specific resource handlers.
+ */
+@Service
+public final class TerraFunctionalTestingManager extends TerraResourceManager {
+
+    private ScreenshotNameResolver nameResolver;
+    private ScreenshotContextParser contextParser;
+    private ScreenshotContextParser contextParserWithSeparator;
+    private TerraPropertiesProvider propertiesProvider;
+
+    //Required for project service creation
+    public TerraFunctionalTestingManager(Project project) {
+    }
+
+    @Override
+    public ScreenshotNameResolver screenshotNameResolver() {
+        return Optional.ofNullable(nameResolver).orElseGet(() -> nameResolver = new TerraFunctionalTestingScreenshotNameResolver());
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser() {
+        return Optional.ofNullable(contextParser).orElseGet(() -> contextParser = new TerraFunctionalTestingScreenshotContextParser());
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser(String contextSeparator) {
+        return Optional.ofNullable(contextParserWithSeparator).orElseGet(() -> contextParserWithSeparator = new TerraFunctionalTestingScreenshotContextParser(contextSeparator));
+    }
+
+    @Override
+    public SpecFolderCollector specFolderCollector() {
+        return SpecFolderCollector.TERRA_FUNCTIONAL_TESTING_SPEC_COLLECTOR;
+    }
+
+    @Override
+    public TerraPropertiesProvider screenshotValidationProperties() {
+        return Optional.ofNullable(propertiesProvider).orElseGet(() -> propertiesProvider = new TerraFunctionalTestingPropertiesProvider());
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingScreenshotContextParser.java b/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingScreenshotContextParser.java
new file mode 100644
index 0000000..4d7c8fa
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/TerraFunctionalTestingScreenshotContextParser.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import static com.picimako.terra.wdio.TerraWdioFolders.DIFF_RELATIVE_PATH;
+import static com.picimako.terra.wdio.TerraWdioFolders.REFERENCE_RELATIVE_PATH;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Terra-toolkit specific context parser.
+ * <p>
+ * The screenshot context includes the theme, locale, browser and viewport a particular screenshot is created for.
+ *
+ * @since 0.6.0
+ */
+public class TerraFunctionalTestingScreenshotContextParser extends ScreenshotContextParser {
+
+    public TerraFunctionalTestingScreenshotContextParser() {
+    }
+
+    public TerraFunctionalTestingScreenshotContextParser(String contextSeparator) {
+        super(contextSeparator);
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * Returns the locale, browser and viewport parts from it in the following format: {@code theme / locale / browser / viewport}.
+     * <p>
+     * For example: {@code theme / en / chrome / huge} from the partial string {@code theme/en/chrome_huge}.
+     * <p>
+     * It handles the diff and reference paths, but not a latest path because this method is not supposed to be called
+     * with the latest path of an image.
+     */
+    @Override
+    public String parse(@NotNull String filePath) {
+        String relativePath = filePath.contains(DIFF_RELATIVE_PATH) ? DIFF_RELATIVE_PATH : REFERENCE_RELATIVE_PATH;
+        String relativeToSnapshots = filePath.substring(filePath.lastIndexOf(relativePath) + relativePath.length() + 1);
+        String[] split = relativeToSnapshots.split(PATH_DELIMITER);
+        return split[0] + contextSeparator + split[1] + contextSeparator + split[2].replace("_", contextSeparator); //theme + locale + browser_viewport separated
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/TerraResourceHandlerProvider.java b/src/main/java/com/picimako/terra/wdio/TerraResourceHandlerProvider.java
new file mode 100644
index 0000000..67fe6af
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/TerraResourceHandlerProvider.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.inspection.TerraPropertiesProvider;
+
+/**
+ * Provides terra resources handlers based on which terra testing library is used in the project.
+ */
+public interface TerraResourceHandlerProvider {
+
+    ScreenshotNameResolver screenshotNameResolver();
+
+    ScreenshotContextParser screenshotContextParser();
+
+    ScreenshotContextParser screenshotContextParser(String contextSeparator);
+
+    SpecFolderCollector specFolderCollector();
+
+    TerraPropertiesProvider screenshotValidationProperties();
+}
diff --git a/src/main/java/com/picimako/terra/wdio/TerraResourceManager.java b/src/main/java/com/picimako/terra/wdio/TerraResourceManager.java
new file mode 100644
index 0000000..7f672c4
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/TerraResourceManager.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import java.util.Optional;
+
+import com.intellij.javascript.nodejs.PackageJsonData;
+import com.intellij.javascript.nodejs.packageJson.PackageJsonFileManager;
+import com.intellij.lang.javascript.buildTools.npm.PackageJsonUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectUtil;
+import com.intellij.openapi.util.ModificationTracker;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.util.CachedValueProvider;
+import com.intellij.psi.util.CachedValuesManager;
+
+/**
+ * Base manager for Terra resource handlers.
+ */
+public abstract class TerraResourceManager implements TerraResourceHandlerProvider {
+
+    private static final String CERNER_TERRA_FUNCTIONAL_TESTING = "@cerner/terra-functional-testing";
+    private static final String CERNER_TERRA_TOOLKIT = "terra-toolkit";
+
+    /**
+     * Creates a resource manager based on the Terra test library used in the project.
+     * <p>
+     * Whether terra-functional-testing or terra-toolkit is used is determined by whether {@code @cerner/terra-functional-testing}
+     * or the {@code terra-toolkit} package is included in the dependencies of the package.json in the project's root.
+     * If, for some reason, both are included, terra-functional-testing takes precedence.
+     * <p>
+     * In case neither of them is included, a no-op resource manager is created, so that the plugin doesn't execute
+     * any of its logic unnecessarily.
+     * <p>
+     * {@code @cerner/terra-cli} is not taken into account when determining the used test library.
+     * <p>
+     * The resource manager instance is cached and is recreated whenever the root package.json file changes.
+     * <p>
+     * The {@code managerType} argument is used introduced for unit tests, so that the exact type of resource manager can be created
+     * without the need to copy an actual package.json file to the in-memory editor in each test, and so that all subsequent calls
+     * to this method will use the same cached object.
+     *
+     * @param project     the current project
+     * @param managerType the type of resource manager to create if defined explicitly
+     */
+    @SafeVarargs
+    public static TerraResourceManager getInstance(Project project, Class<? extends TerraResourceManager>... managerType) {
+        return CachedValuesManager.getManager(project).getCachedValue(project, () -> {
+            if (managerType != null && managerType.length == 1) {
+                return CachedValueProvider.Result.create(project.getService(managerType[0]), ModificationTracker.NEVER_CHANGED);
+            }
+            Object[] dependencies = new Object[1];
+            Optional<PackageJsonData> rootPackageJson = PackageJsonFileManager.getInstance(project).getValidPackageJsonFiles().stream()
+                .filter(packageJson -> {
+                    VirtualFile projectDir = ProjectUtil.guessProjectDir(project);
+                    if (projectDir != null && packageJson.getParent().getPath().equals(projectDir.getPath())) {
+                        dependencies[0] = packageJson;
+                        return true;
+                    }
+                    return false;
+                })
+                .map(PackageJsonUtil::getOrCreateData)
+                .findFirst();
+
+            if (rootPackageJson.isPresent()) { //dependencies[0] is implicitly not null when rootPackageJson.isPresent()
+                if (rootPackageJson.get().containsOneOfDependencyOfAnyType(CERNER_TERRA_FUNCTIONAL_TESTING)) {
+                    return CachedValueProvider.Result.create(project.getService(TerraFunctionalTestingManager.class), dependencies[0]);
+                } else if (rootPackageJson.get().containsOneOfDependencyOfAnyType(CERNER_TERRA_TOOLKIT)) {
+                    return CachedValueProvider.Result.create(project.getService(TerraToolkitManager.class), dependencies[0]);
+                }
+            }
+            //This will happen when there is a root package.json containing none of the Terra related dependencies,            
+            // or when there is no package.json in the project root.
+            return CachedValueProvider.Result.create(project.getService(NoopResourceManager.class), ModificationTracker.NEVER_CHANGED);
+        });
+    }
+
+    public static boolean isUsingTerra(Project project) {
+        return !(getInstance(project) instanceof NoopResourceManager);
+    }
+
+    public static boolean isUsingTerraToolkit(Project project) {
+        return getInstance(project) instanceof TerraToolkitManager;
+    }
+
+    public static boolean isUsingTerraFunctionalTesting(Project project) {
+        return getInstance(project) instanceof TerraFunctionalTestingManager;
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/TerraToolkitManager.java b/src/main/java/com/picimako/terra/wdio/TerraToolkitManager.java
new file mode 100644
index 0000000..3180f84
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/TerraToolkitManager.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import java.util.Optional;
+
+import com.intellij.openapi.components.Service;
+import com.intellij.openapi.project.Project;
+
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.TerraToolkitScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.inspection.TerraPropertiesProvider;
+import com.picimako.terra.wdio.screenshot.inspection.TerraToolkitPropertiesProvider;
+
+/**
+ * Provides terra-toolkit specific resource handlers.
+ */
+@Service
+public final class TerraToolkitManager extends TerraResourceManager {
+
+    private ScreenshotNameResolver nameResolver;
+    private ScreenshotContextParser contextParser;
+    private ScreenshotContextParser contextParserWithSeparator;
+    private TerraPropertiesProvider propertiesProvider;
+
+    //Required for project service creation
+    public TerraToolkitManager(Project project) {
+    }
+
+    @Override
+    public ScreenshotNameResolver screenshotNameResolver() {
+        return Optional.ofNullable(nameResolver).orElseGet(() -> nameResolver = new TerraToolkitScreenshotNameResolver());
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser() {
+        return Optional.ofNullable(contextParser).orElseGet(() -> contextParser = new TerraToolkitScreenshotContextParser());
+    }
+
+    @Override
+    public ScreenshotContextParser screenshotContextParser(String contextSeparator) {
+        return Optional.ofNullable(contextParserWithSeparator).orElseGet(() -> contextParserWithSeparator = new TerraToolkitScreenshotContextParser(contextSeparator));
+    }
+
+    @Override
+    public SpecFolderCollector specFolderCollector() {
+        return SpecFolderCollector.TERRA_TOOLKIT_SPEC_COLLECTOR;
+    }
+
+    @Override
+    public TerraPropertiesProvider screenshotValidationProperties() {
+        return Optional.ofNullable(propertiesProvider).orElseGet(() -> propertiesProvider = new TerraToolkitPropertiesProvider());
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/imagepreview/ScreenshotContextParser.java b/src/main/java/com/picimako/terra/wdio/TerraToolkitScreenshotContextParser.java
similarity index 50%
rename from src/main/java/com/picimako/terra/wdio/imagepreview/ScreenshotContextParser.java
rename to src/main/java/com/picimako/terra/wdio/TerraToolkitScreenshotContextParser.java
index 4b63a21..7504afd 100644
--- a/src/main/java/com/picimako/terra/wdio/imagepreview/ScreenshotContextParser.java
+++ b/src/main/java/com/picimako/terra/wdio/TerraToolkitScreenshotContextParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.imagepreview;
+package com.picimako.terra.wdio;
 
 import static com.picimako.terra.wdio.TerraWdioFolders.DIFF_RELATIVE_PATH;
 import static com.picimako.terra.wdio.TerraWdioFolders.REFERENCE_RELATIVE_PATH;
@@ -22,36 +22,34 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * A screenshot context includes the locale, the browser and viewport a particular screenshot is created for.
+ * Terra-toolkit specific context parser.
+ * <p>
+ * The screenshot context includes the locale, browser and viewport a particular screenshot is created for.
  */
-public final class ScreenshotContextParser {
-    public static final String DEFAULT_CONTEXT_SEPARATOR = " | ";
-    public static final String PATH_DELIMITER = "/";
-    private final String contextSeparator;
+public final class TerraToolkitScreenshotContextParser extends ScreenshotContextParser {
 
-    public ScreenshotContextParser() {
-        this.contextSeparator = DEFAULT_CONTEXT_SEPARATOR;
+    public TerraToolkitScreenshotContextParser() {
     }
 
-    public ScreenshotContextParser(@NotNull String contextSeparator) {
-        this.contextSeparator = contextSeparator;
+    public TerraToolkitScreenshotContextParser(String contextSeparator) {
+        super(contextSeparator);
     }
 
     /**
-     * Parses the argument path and returns the locale, browser and viewport parts from it in the following format: {@code locale | browser | viewport}.
+     * {@inheritDoc}
+     * <p>
+     * Returns the locale, browser and viewport parts from it in the following format: {@code locale | browser | viewport}.
      * <p>
      * For example: {@code en | chrome | huge} from the partial string {@code /en/chrome_huge}.
      * <p>
      * It handles the diff and reference paths, but not a latest path because this method is not supposed to be called
      * with the latest path of an image.
-     *
-     * @param virtualFilePath the path to parse
-     * @return the formatted context string
      */
-    public String parse(@NotNull String virtualFilePath) {
-        String relativePath = virtualFilePath.contains(DIFF_RELATIVE_PATH) ? DIFF_RELATIVE_PATH : REFERENCE_RELATIVE_PATH;
-        String relativeToSnapshots = virtualFilePath.substring(virtualFilePath.lastIndexOf(relativePath) + relativePath.length() + 1);
+    @Override
+    public String parse(@NotNull String filePath) {
+        String relativePath = filePath.contains(DIFF_RELATIVE_PATH) ? DIFF_RELATIVE_PATH : REFERENCE_RELATIVE_PATH;
+        String relativeToSnapshots = filePath.substring(filePath.lastIndexOf(relativePath) + relativePath.length() + 1);
         String[] split = relativeToSnapshots.split(PATH_DELIMITER);
-        return split[0] + contextSeparator + split[1].replace("_", contextSeparator);
+        return split[0] + contextSeparator + split[1].replace("_", contextSeparator); //locale + browser_viewport separated
     }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/TerraWdioFolders.java b/src/main/java/com/picimako/terra/wdio/TerraWdioFolders.java
index 9670339..0e67d7d 100644
--- a/src/main/java/com/picimako/terra/wdio/TerraWdioFolders.java
+++ b/src/main/java/com/picimako/terra/wdio/TerraWdioFolders.java
@@ -23,7 +23,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectUtil;
@@ -36,6 +35,7 @@
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
 
 import com.picimako.terra.DirectoryPsiUtil;
 import com.picimako.terra.settings.TerraApplicationState;
@@ -60,6 +60,7 @@ public final class TerraWdioFolders {
     public static final String DIFF_RELATIVE_PATH = "/" + SNAPSHOTS + "/" + DIFF;
     private static final String LATEST_RELATIVE_PATH = "/" + SNAPSHOTS + "/" + LATEST;
 
+    //TODO: this might be problematic with multiple projects having different wdio paths
     private static String wdioTestRootPath;
 
     /**
@@ -128,22 +129,6 @@ public static String getRelativePathToProjectDir(@NotNull Project project, @NotN
         return VfsUtil.getRelativePath(testRoot, ProjectUtil.guessProjectDir(project));
     }
 
-    /**
-     * Collect spec folders within the provided Terra wdio test root, and within that inside the provided {@code imageType} folder
-     * (diff, latest or reference), and return it as a {@link Stream} for further manipulation.
-     *
-     * @param imageType                 the image type folder to collect the spec folders from
-     * @param filesAndFoldersInWdioRoot the list of files and folders inside the wdio test root
-     * @return the stream of virtual files for the necessary spec folders
-     */
-    @NotNull
-    public static Stream<VirtualFile> collectSpecFoldersInside(@NotNull String imageType, @NotNull List<VirtualFile> filesAndFoldersInWdioRoot) {
-        return filesAndFoldersInWdioRoot.stream()
-            .filter(VirtualFile::isDirectory)
-            .filter(dir -> dir.getName().endsWith("-spec"))
-            .filter(dir -> imageType.equals(dir.getParent().getParent().getParent().getName()));
-    }
-
     /**
      * Gets the value that identifies a spec folder within a {@code __snapshots__} folder.
      * <p>
@@ -235,7 +220,6 @@ public static boolean isInWdioFiles(VirtualFile file, Project project) {
      *
      * @param file the file to check the location of
      * @return true if the file is under __snapshots__ directory, false otherwise
-     *
      * @since 0.5.0
      */
     public static boolean isInSnapshotsDirectory(@Nullable VirtualFile file) {
@@ -394,6 +378,22 @@ public static String diffPath() {
     public static void setWdioTestRootPath(String path) {
         wdioTestRootPath = path;
     }
+    
+    @TestOnly
+    public static String getWdioTestRootPath() {
+        return wdioTestRootPath;
+    }
+
+    /**
+     * Refreshes the argument virtual file and returns whether it still exists or not.
+     */
+    public static boolean existsAfterRefresh(@Nullable VirtualFile virtualFile) {
+        if (virtualFile != null) {
+            virtualFile.refresh(false, virtualFile.isDirectory());
+            return virtualFile.exists();
+        }
+        return false;
+    }
 
     private TerraWdioFolders() {
         //Utility class
diff --git a/src/main/java/com/picimako/terra/wdio/TerraWdioInspectionBase.java b/src/main/java/com/picimako/terra/wdio/TerraWdioInspectionBase.java
index 3c2ed59..669afb9 100644
--- a/src/main/java/com/picimako/terra/wdio/TerraWdioInspectionBase.java
+++ b/src/main/java/com/picimako/terra/wdio/TerraWdioInspectionBase.java
@@ -16,24 +16,18 @@
 
 package com.picimako.terra.wdio;
 
-import static com.picimako.terra.psi.js.JSArgumentUtil.getArgumentsOf;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_DESCRIBE_VIEWPORTS;
-import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_IT_MATCHES_SCREENSHOT;
-import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_IT_VALIDATES_ELEMENT;
-import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_VALIDATES_ELEMENT;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_VALIDATES_SCREENSHOT;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getMethodExpressionOf;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.hasText;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTopLevelExpression;
 
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
-import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
-import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -76,36 +70,6 @@ protected boolean isTerraValidatesScreenshotExpression(PsiElement element) {
         return !isTopLevelExpression(element) && hasText(element, TERRA_VALIDATES_SCREENSHOT);
     }
 
-    /**
-     * Gets whether the argument element is a {@code Terra.it.matchesScreenshot()} call at any level deep.
-     * <p>
-     * Such calls at top level are ignored.
-     *
-     * @param element the Psi element to check
-     * @return true if the argument is a non-top-level {@code Terra.it.matchesScreenshot()}, false otherwise
-     */
-    protected boolean isTerraItMatchesScreenshotExpression(PsiElement element) {
-        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_MATCHES_SCREENSHOT);
-    }
-
-    /**
-     * Gets whether the argument element corresponds to one of the Terra function calls that do screenshot validation,
-     * namely:
-     * <ul>
-     *     <li>Terra.validates.screenshot</li>
-     *     <li>Terra.validates.element</li>
-     *     <li>Terra.it.matchesScreenshot</li>
-     *     <li>Terra.it.validatesElement</li>
-     * </ul>
-     *
-     * @param element the element to validate
-     * @return true if the argument is one of the Terra screenshot matching functions, false otherwise
-     */
-    protected boolean isTerraElementOrScreenshotValidationFunction(PsiElement element) {
-        return !isTopLevelExpression(element)
-                && hasText(element, TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT, TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT);
-    }
-
     /**
      * Returns the reference name element from the argument expression.
      * <p>
@@ -155,10 +119,6 @@ protected PsiElement getFunctionNameElement(JSExpression methodExpression) {
         return ((JSReferenceExpression) methodExpression).getReferenceNameElement();
     }
 
-    private boolean isTopLevelExpression(@NotNull PsiElement element) {
-        return element.getParent() instanceof PsiFile;
-    }
-
     private boolean isTerraDescribeViewportsBlock(@NotNull PsiElement element) {
         return hasText(element, TERRA_DESCRIBE_VIEWPORTS);
     }
diff --git a/src/main/java/com/picimako/terra/wdio/TerraWdioPsiUtil.java b/src/main/java/com/picimako/terra/wdio/TerraWdioPsiUtil.java
index cfd5a31..f0c8263 100644
--- a/src/main/java/com/picimako/terra/wdio/TerraWdioPsiUtil.java
+++ b/src/main/java/com/picimako/terra/wdio/TerraWdioPsiUtil.java
@@ -24,16 +24,21 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Stream;
 
 import com.intellij.lang.javascript.psi.JSArgumentList;
 import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
 import com.intellij.lang.javascript.psi.JSProperty;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -65,24 +70,31 @@ public final class TerraWdioPsiUtil {
     public static final String TERRA_IT = "Terra.it";
 
     //Validation properties
-    public static final String MISMATCH_TOLERANCE = "misMatchTolerance";
+    //terra-functional-testing version
+    public static final String MISMATCH_TOLERANCE = "mismatchTolerance";
+    public static final String RULES = "rules";
+    //terra-toolkit version
+    public static final String MIS_MATCH_TOLERANCE = "misMatchTolerance";
     public static final String SELECTOR = "selector";
+    public static final String VIEWPORTS = "viewports";
+    public static final String AXE_RULES = "axeRules";
 
     //Spec files
     public static final String WDIO_SPEC_FILE_NAME_PATTERN = ".*-spec\\.(jsx?|ts)$";
 
-    private static final Set<String> TERRA_FUNCTIONS = Set.of(TERRA_DESCRIBE_VIEWPORTS, TERRA_VIEWPORTS, TERRA_HIDE_INPUT_CARET,
+    private static final Set<String> TERRA_FUNCTIONS = Set.of(
+        TERRA_DESCRIBE_VIEWPORTS, TERRA_VIEWPORTS, TERRA_HIDE_INPUT_CARET,
         TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT, TERRA_IT_IS_ACCESSIBLE,
         TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT, TERRA_VALIDATES_ACCESSIBILITY,
-        TERRA, TERRA_VALIDATES, TERRA_IT);
+        TERRA_VALIDATES, TERRA_IT);
 
     /**
      * The items in the list are in ascending order by their widths.
      */
     public static final List<String> SUPPORTED_TERRA_VIEWPORTS = List.of("tiny", "small", "medium", "large", "huge", "enormous");
 
-    public static final Set<String> SCREENSHOT_VALIDATION_NAMES = Set.of(TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT,
-        TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT);
+    public static final Set<String> SCREENSHOT_VALIDATION_NAMES = Set.of(
+        TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT, TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT);
 
 
     /**
@@ -162,8 +174,7 @@ public static JSExpression getMethodExpressionOf(@NotNull PsiElement element) {
      * @return true if the element is one of the Terra wdio objects or functions, false otherwise
      */
     public static boolean isAnyOfTerraWdioFunctions(@NotNull PsiElement element) {
-        PsiElement parent = element.getParent();
-        return parent != null && TERRA_FUNCTIONS.contains(parent.getText());
+        return element.getParent() != null && TERRA_FUNCTIONS.contains(element.getParent().getText());
     }
 
     /**
@@ -176,7 +187,7 @@ public static boolean isAnyOfTerraWdioFunctions(@NotNull PsiElement element) {
     public static boolean hasText(@NotNull PsiElement element, String... desiredTexts) {
         if (desiredTexts.length > 0) {
             JSExpression methodExpression = getMethodExpressionOf(element);
-            return methodExpression != null && Arrays.stream(desiredTexts).anyMatch(text -> text.equals(methodExpression.getText()));
+            return methodExpression != null && Arrays.stream(desiredTexts).anyMatch(methodExpression::textMatches);
         }
         return false;
     }
@@ -196,6 +207,71 @@ public static boolean isScreenshotValidationCall(@Nullable JSCallExpression expr
         return false;
     }
 
+    /**
+     * Returns whether the argument element is a top level expression.
+     * <p>
+     * This is achieved by checking whether the element's parent is the containing file itself.
+     *
+     * @param element the element to check
+     * @since 0.6.0
+     */
+    public static boolean isTopLevelExpression(@NotNull PsiElement element) {
+        return element.getParent() instanceof PsiFile;
+    }
+
+    public static boolean isTerraIt(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT, TERRA_IT_IS_ACCESSIBLE);
+    }
+
+    /**
+     * Gets whether the argument element is a {@code Terra.it.matchesScreenshot()} call at any level deep.
+     * <p>
+     * Such calls at top level are ignored.
+     *
+     * @param element the Psi element to check
+     * @return true if the argument is a non-top-level {@code Terra.it.matchesScreenshot()}, false otherwise
+     */
+    public static boolean isTerraItMatchesScreenshot(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_MATCHES_SCREENSHOT);
+    }
+
+    /**
+     * Gets whether the argument element corresponds to one of the Terra function calls that do screenshot validation,
+     * namely: {@code Terra.it.matchesScreenshot}, {@code Terra.it.validatesElement}, {@code Terra.validates.screenshot}
+     * and {@code Terra.validates.element}.
+     *
+     * @param element the element to validate
+     * @return true if the argument is one of the Terra screenshot matching functions, false otherwise
+     */
+    public static boolean isTerraElementOrScreenshotValidation(PsiElement element) {
+        return !isTopLevelExpression(element)
+            && hasText(element, TERRA_IT_MATCHES_SCREENSHOT, TERRA_IT_VALIDATES_ELEMENT, TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT);
+    }
+
+    public static boolean isNonTerraItElementOrScreenshotValidation(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT);
+    }
+
+    public static boolean isScreenshotValidation(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_MATCHES_SCREENSHOT, TERRA_VALIDATES_SCREENSHOT);
+    }
+
+    public static boolean isElementValidation(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_VALIDATES_ELEMENT, TERRA_VALIDATES_ELEMENT);
+    }
+
+    public static boolean isAccessibilityValidation(PsiElement element) {
+        return !isTopLevelExpression(element) && hasText(element, TERRA_IT_IS_ACCESSIBLE, TERRA_VALIDATES_ACCESSIBILITY);
+    }
+    
+    public static boolean isInContextOfNonTerraItElementOrScreenshotValidation(JSLiteralExpression literal) {
+        return Optional.of(literal)
+            .map(PsiElement::getParent)
+            .map(PsiElement::getPrevSibling)
+            .map(methodExpression -> Stream.of(TERRA_VALIDATES_SCREENSHOT, TERRA_VALIDATES_ELEMENT).anyMatch(methodExpression::textMatches))
+            .orElse(false);
+    }
+
     /**
      * Returns the JS property for the argument property name within the provided PsiElement,
      * or null if the element has no such property.
@@ -206,12 +282,23 @@ public static boolean isScreenshotValidationCall(@Nullable JSCallExpression expr
      * </pre>
      * it will return the element corresponding to the "{@code misMatchTolerance: 0.7}" part.
      *
-     * @param element      the Psi element to get the property from
-     * @param propertyName the property name to retrieve the property by
+     * @param element              the Psi element to get the property from
+     * @param propertyNameVariants variants of a property name to retrieve any of them if found
      * @return the JSProperty for the property, or null
      */
     @Nullable
-    public static JSProperty getScreenshotValidationProperty(PsiElement element, String propertyName) {
+    public static JSProperty getScreenshotValidationProperty(PsiElement element, String... propertyNameVariants) {
+        JSObjectLiteralExpression propertiesObject = getTerraValidationPropertyObject(element);
+        return propertiesObject != null
+            ? Arrays.stream(propertyNameVariants)
+            .map(propertiesObject::findProperty)
+            .filter(Objects::nonNull)
+            .findAny()
+            .orElse(null)
+            : null;
+    }
+
+    private static JSObjectLiteralExpression getTerraValidationPropertyObject(PsiElement element) {
         JSExpression[] arguments = null;
         if (element instanceof JSExpressionStatement) {
             arguments = getArgumentsOf((JSExpressionStatement) element);
@@ -221,15 +308,25 @@ public static JSProperty getScreenshotValidationProperty(PsiElement element, Str
                 arguments = argumentList.getArguments();
             }
         }
-        if (arguments != null && arguments.length > 0 && arguments.length < 3) {
-            if (arguments[arguments.length - 1] instanceof JSObjectLiteralExpression) {
-                JSObjectLiteralExpression argument = (JSObjectLiteralExpression) arguments[arguments.length - 1];
-                return argument.findProperty(propertyName);
-            }
+        if (arguments != null && arguments.length > 0 && arguments.length < 3 && arguments[arguments.length - 1] instanceof JSObjectLiteralExpression) {
+            return (JSObjectLiteralExpression) arguments[arguments.length - 1];
         }
+
         return null;
     }
 
+    /**
+     * Returns the list of JS properties from Terra.it and Terra.validates helpers.
+     *
+     * @param element the JSExpressionStatement to get the properties from
+     * @since 0.6.0
+     */
+    public static JSProperty[] getTerraValidationProperties(PsiElement element) {
+        return Optional.ofNullable(getTerraValidationPropertyObject(element))
+            .map(JSObjectLiteralExpression::getProperties)
+            .orElse(JSProperty.EMPTY_ARRAY);
+    }
+
     private TerraWdioPsiUtil() {
         //Utility class
     }
diff --git a/src/main/java/com/picimako/terra/wdio/ToScreenshotUsageNavigator.java b/src/main/java/com/picimako/terra/wdio/ToScreenshotUsageNavigator.java
index eba4efe..ce4e02d 100644
--- a/src/main/java/com/picimako/terra/wdio/ToScreenshotUsageNavigator.java
+++ b/src/main/java/com/picimako/terra/wdio/ToScreenshotUsageNavigator.java
@@ -22,10 +22,11 @@
 
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 
-import com.picimako.terra.wdio.screenshot.TerraScreenshotNameResolver;
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
 
 /**
  * Provides functionality to navigate from a screenshot, or a UI item representing a screenshot, to the usage of
@@ -36,9 +37,13 @@
  */
 public class ToScreenshotUsageNavigator {
 
-    private final TerraScreenshotNameResolver resolver = new TerraScreenshotNameResolver();
+    private final ScreenshotNameResolver resolver;
     private boolean hasNavigated;
 
+    public ToScreenshotUsageNavigator(Project project) {
+        resolver = TerraResourceManager.getInstance(project).screenshotNameResolver();
+    }
+
     /**
      * Navigates to the Terra validation call in the given spec file, based on the provided screenshot name.
      *
diff --git a/src/main/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreview.java b/src/main/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreview.java
index af253da..ca179a4 100644
--- a/src/main/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreview.java
+++ b/src/main/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreview.java
@@ -16,11 +16,9 @@
 
 package com.picimako.terra.wdio.imagepreview;
 
-import static com.picimako.terra.wdio.TerraWdioFolders.collectSpecFoldersInside;
 import static java.util.stream.Collectors.toList;
 
 import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Function;
@@ -35,9 +33,12 @@
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.picimako.terra.wdio.SpecFolderCollector;
+import com.picimako.terra.wdio.TerraResourceManager;
 import com.picimako.terra.wdio.TerraWdioFolders;
 
 /**
@@ -50,7 +51,7 @@
  */
 public abstract class AbstractScreenshotsPreview implements FileEditor {
 
-    protected final List<ScreenshotDiff> screenshotDiffs = new ArrayList<>();
+    protected final List<ScreenshotDiff> screenshotDiffs = new SmartList<>();
     protected final Project project;
 
     protected AbstractScreenshotsPreview(@NotNull Project project, @NotNull VirtualFile file, @NotNull String sourceFolderName,
@@ -60,7 +61,8 @@ protected AbstractScreenshotsPreview(@NotNull Project project, @NotNull VirtualF
         // from/via screenshots. Having at least one screenshot means that there is a wdio root.
         if (wdioFolder != null) {
             wdioFolder.refresh(false, true);
-            this.screenshotDiffs.addAll(collectSpecFoldersInside(sourceFolderName, VfsUtil.collectChildrenRecursively(wdioFolder))
+            SpecFolderCollector specFolderCollector = TerraResourceManager.getInstance(project).specFolderCollector();
+            this.screenshotDiffs.addAll(specFolderCollector.collectSpecFoldersForTypeInside(sourceFolderName, VfsUtil.collectChildrenRecursively(wdioFolder))
                 .flatMap(spec -> Arrays.stream(VfsUtil.getChildren(spec))) //individual screenshot files
                 .filter(screenshot -> file.getName().equals(screenshot.getName()))
                 .map(screenshotToDiffMapper)
@@ -95,7 +97,7 @@ public List<ScreenshotDiff> getScreenshotDiffs() {
     public @NotNull JComponent getComponent() {
         return screenshotDiffs.isEmpty()
             ? TerraScreenshotsDiffViewContainer.noScreenshotAvailable()
-            : new TerraScreenshotsDiffViewContainer(screenshotDiffs, uiContentProvider());
+            : new TerraScreenshotsDiffViewContainer(screenshotDiffs, uiContentProvider(), project);
     }
 
     /**
diff --git a/src/main/java/com/picimako/terra/wdio/imagepreview/TerraScreenshotsDiffViewContainer.java b/src/main/java/com/picimako/terra/wdio/imagepreview/TerraScreenshotsDiffViewContainer.java
index c713484..ff91eb9 100644
--- a/src/main/java/com/picimako/terra/wdio/imagepreview/TerraScreenshotsDiffViewContainer.java
+++ b/src/main/java/com/picimako/terra/wdio/imagepreview/TerraScreenshotsDiffViewContainer.java
@@ -23,9 +23,12 @@
 import java.util.List;
 import javax.swing.*;
 
+import com.intellij.openapi.project.Project;
 import com.intellij.ui.components.JBScrollPane;
 import org.jetbrains.annotations.NotNull;
 
+import com.picimako.terra.wdio.TerraResourceManager;
+
 /**
  * A container panel for storing the different screenshot diff view components in a vertically scrollable view.
  * <p>
@@ -33,11 +36,14 @@
  */
 public class TerraScreenshotsDiffViewContainer extends JPanel {
 
+    private Project project;
+
     private TerraScreenshotsDiffViewContainer() {
         add(new JLabel("There is no screenshot available to display."));
     }
 
-    public TerraScreenshotsDiffViewContainer(@NotNull List<ScreenshotDiff> screenshotDiffs, @NotNull ScreenshotDiffUIContentProvider uiProvider) {
+    public TerraScreenshotsDiffViewContainer(@NotNull List<ScreenshotDiff> screenshotDiffs, @NotNull ScreenshotDiffUIContentProvider uiProvider, Project project) {
+        this.project = project;
         setLayout(new BorderLayout());
         JPanel previewContent = new JPanel();
         previewContent.setLayout(new BoxLayout(previewContent, BoxLayout.Y_AXIS));
@@ -57,7 +63,9 @@ public TerraScreenshotsDiffViewContainer(@NotNull List<ScreenshotDiff> screensho
 
     @NotNull
     private JLabel screenshotContextLabelFor(ScreenshotDiff screenshotDiff) {
-        JLabel contextLabel = new JLabel(new ScreenshotContextParser().parse(screenshotDiff.getOriginal().getPath()));
+        JLabel contextLabel = new JLabel(TerraResourceManager.getInstance(project)
+            .screenshotContextParser()
+            .parse(screenshotDiff.getOriginal().getPath()));
         contextLabel.setFont(getFont().deriveFont(16f));
         contextLabel.setAlignmentX(Component.CENTER_ALIGNMENT); //https://stackoverflow.com/questions/2560784/how-to-center-elements-in-the-boxlayout-using-center-of-the-element
         return contextLabel;
diff --git a/src/main/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspection.java b/src/main/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspection.java
new file mode 100644
index 0000000..029d699
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspection.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.inspection;
+
+import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.psi.js.JSArgumentUtil.getArgumentListOf;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.hasText;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraIt;
+
+import java.util.Map;
+
+import com.intellij.codeInspection.LocalInspectionToolSession;
+import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.codeInspection.util.IntentionFamilyName;
+import com.intellij.codeInspection.util.IntentionName;
+import com.intellij.lang.javascript.psi.JSArgumentList;
+import com.intellij.lang.javascript.psi.JSBlockStatement;
+import com.intellij.lang.javascript.psi.JSCallExpression;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSExpressionStatement;
+import com.intellij.lang.javascript.psi.impl.JSPsiElementFactory;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.SmartPointerManager;
+import com.intellij.psi.SmartPsiElementPointer;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.siyeh.ig.InspectionGadgetsFix;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraWdioInspectionBase;
+
+/**
+ * This inspection reports usage of {@code Terra.it} helpers, and provides quick fixes to replace them with their
+ * {@code Terra.validates} counterparts.
+ * <p>
+ * All three Terra.it helpers are supported, and based on the presence of before hooks, alternative quick fixes may be
+ * available to merge the particular Terra.it with the {@code before} hook before it.
+ * <p>
+ * The quick fix doesn't apply code reformatting at the moment, and the replacement may have an additional empty line.
+ */
+public class ReplaceTerraItWithTerraValidatesInspection extends TerraWdioInspectionBase {
+
+    private static final Map<String, String> IT_TO_VALIDATES = Map.of(
+        "Terra.it.validatesElement", "Terra.validates.element",
+        "Terra.it.matchesScreenshot", "Terra.validates.screenshot",
+        "Terra.it.isAccessible", "Terra.validates.accessibility"
+    );
+
+    @Override
+    public @NotNull String getShortName() {
+        return "ReplaceTerraItWithTerraValidates";
+    }
+
+    @Override
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+        
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSExpressionStatement(JSExpressionStatement node) {
+                super.visitJSExpressionStatement(node);
+
+                if (isInWdioSpecFile(node) && isTerraIt(node) && node.getExpression() instanceof JSCallExpression) {
+                    JSExpression methodExpression = ((JSCallExpression) node.getExpression()).getMethodExpression();
+                    if (methodExpression != null) {
+                        JSExpressionStatement[] before = new JSExpressionStatement[1];
+                        if (hasPrecedingBeforeHook(node, before)) {
+                            registerProblem(methodExpression, new ReplaceTerraItWithTerraValidatesQuickFix(TerraBundle.inspection("replace.terra.it.before.merged"), before[0]));
+                            registerProblem(methodExpression, new ReplaceTerraItWithTerraValidatesQuickFix(TerraBundle.inspection("replace.terra.it.before.unchanged")));
+                        } else {
+                            registerProblem(methodExpression, new ReplaceTerraItWithTerraValidatesQuickFix(TerraBundle.inspection("replace.terra.it.simple")));
+                        }
+                    }
+                }
+            }
+
+            private boolean hasPrecedingBeforeHook(JSExpressionStatement node, JSExpressionStatement[] before) {
+                JSExpressionStatement previousSibling = PsiTreeUtil.getPrevSiblingOfType(node, JSExpressionStatement.class);
+                if (previousSibling != null && hasText(previousSibling, "before")) {
+                    before[0] = previousSibling;
+                    return true;
+                }
+                return false;
+            }
+
+            private void registerProblem(JSExpression methodExpression, InspectionGadgetsFix quickFix) {
+                holder.registerProblem(methodExpression, TerraBundle.inspection("replace.message"), quickFix);
+            }
+        };
+    }
+
+    private static final class ReplaceTerraItWithTerraValidatesQuickFix extends InspectionGadgetsFix {
+
+        private final String quickFixName;
+        private SmartPsiElementPointer<JSExpressionStatement> before;
+
+        public ReplaceTerraItWithTerraValidatesQuickFix(String quickFixName) {
+            this.quickFixName = quickFixName;
+        }
+
+        public ReplaceTerraItWithTerraValidatesQuickFix(String quickFixName, JSExpressionStatement before) {
+            this.quickFixName = quickFixName;
+            this.before = SmartPointerManager.getInstance(before.getProject()).createSmartPsiElementPointer(before);
+        }
+
+        @Override
+        protected void doFix(Project project, ProblemDescriptor descriptor) {
+            PsiElement terraItCall = descriptor.getPsiElement(); //e.g.: Terra.it.validatesElement
+            PsiElement terraItStatement = terraItCall.getParent().getParent(); //e.g.: Terra.it.validatesElement();
+
+            JSArgumentList originalArgumentList = getArgumentListOf((JSExpressionStatement) terraItStatement);
+            String arguments = originalArgumentList != null && originalArgumentList.getArguments().length != 0
+                ? originalArgumentList.getText() + ";" //e.g.: ('test name', {selector: '#css-selector'})
+                : "();";
+            //e.g.: Terra.validates.element
+            JSExpressionStatement terraValidates = JSPsiElementFactory.createJSStatement(IT_TO_VALIDATES.get(terraItCall.getText()) + arguments, terraItStatement, JSExpressionStatement.class);
+            JSExpressionStatement itBlock = JSPsiElementFactory.createJSStatement("it('INSERT TEST NAME', () => {\n" + "});", terraItStatement, JSExpressionStatement.class);
+
+            JSBlockStatement itBlockCallback = PsiTreeUtil.findChildOfType(itBlock, JSBlockStatement.class);
+            //Add right after the opening curly braces.
+            //itBlockCallback should never be null, since it is created from a fix and correct template text
+            itBlockCallback.addAfter(terraValidates, itBlockCallback.getFirstChild());
+
+            //Copy everything from the before hook to the beginning of the it block
+            if (before != null) {
+                JSBlockStatement beforeHookCallback = PsiTreeUtil.findChildOfType(before.getElement(), JSBlockStatement.class);
+                if (beforeHookCallback != null) {
+                    PsiElement[] children = beforeHookCallback.getChildren();
+                    for (int i = children.length - 2; i >= 1; i--) { //skip copying curly braces
+                        itBlockCallback.addAfter(children[i], itBlockCallback.getFirstChild());
+                    }
+                    before.getElement().delete();
+                }
+            }
+
+            terraItStatement.replace(itBlock);
+        }
+
+        @Override
+        public @IntentionName @NotNull String getName() {
+            return quickFixName;
+        }
+
+        @Override
+        public @IntentionFamilyName @NotNull String getFamilyName() {
+            return TerraBundle.inspection("replace.family.name");
+        }
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java b/src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java
index 0bfbcf2..b71e9f2 100644
--- a/src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java
+++ b/src/main/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewAction.java
@@ -17,6 +17,7 @@
 package com.picimako.terra.wdio.projectview.action;
 
 import static com.picimako.terra.wdio.ProblemDialogs.showNoValidationCallToNavigateToDialog;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioFolders.isInSnapshotsDirectory;
 import static com.picimako.terra.wdio.TerraWdioFolders.isSnapshotsDirectory;
 import static com.picimako.terra.wdio.TerraWdioFolders.specFolderIdentifier;
@@ -56,8 +57,6 @@
  */
 public class NavigateToScreenshotUsageProjectViewAction extends AnAction {
 
-    private final ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator();
-
     public NavigateToScreenshotUsageProjectViewAction() {
         super(TerraBundle.message("terra.wdio.project.view.screenshot.navigate.to.usage"));
     }
@@ -81,7 +80,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                         .filter(file -> file.getVirtualFile().getNameWithoutExtension().equals(specId))
                         .findFirst()
                         .ifPresentOrElse(specFile -> {
-                            if (!navigator.navigateToUsage(specFile, selectedScreenshot.getName())) {
+                            if (!new ToScreenshotUsageNavigator(e.getProject()).navigateToUsage(specFile, selectedScreenshot.getName())) {
                                 showNoValidationCallToNavigateToDialog();
                             }
                         }, ProblemDialogs::showNoSpecFileToNavigateToDialog);
@@ -92,7 +91,8 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 
     @Override
     public void update(@NotNull AnActionEvent e) {
-        e.getPresentation().setEnabled(isInSnapshotsDirectory(e.getData(PlatformDataKeys.VIRTUAL_FILE))
+        e.getPresentation().setEnabled(isUsingTerra(e.getProject())
+            && isInSnapshotsDirectory(e.getData(PlatformDataKeys.VIRTUAL_FILE))
             && e.getData(PlatformDataKeys.PSI_FILE) instanceof PsiBinaryFile);
     }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/AbstractScreenshotNameResolver.java b/src/main/java/com/picimako/terra/wdio/screenshot/AbstractScreenshotNameResolver.java
new file mode 100644
index 0000000..cfe6ecd
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/AbstractScreenshotNameResolver.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Common class for screenshot name resolution.
+ * <p>
+ * Provides the logic for normalizing the screenshot names and parsing the test ids from the name arguments.
+ */
+public abstract class AbstractScreenshotNameResolver implements ScreenshotNameResolver {
+
+    /**
+     * The regular expression for the character replacement can be found in
+     * <a href="https://github.com/cerner/terra-toolkit-boneyard/blob/main/config/wdio/visualRegressionConf.js">terra-toolkit-boneyard//visualRegressionConf.js</a>
+     * and
+     * <a href="https://github.com/cerner/terra-toolkit/blob/main/packages/terra-functional-testing/src/services/wdio-visual-regression-service/methods/BaseCompare.js</a>
+     */
+    protected static final String DELIMITERS_TO_REPLACE = "\\s+|\\.|\\+";
+    protected static final String CHARACTERS_TO_REPLACE = "[?<>/|*:+\"]";
+
+    protected static final Pattern TEST_ID_PATTERN = Pattern.compile("\\[(?<testId>[^)]+)]");
+
+    /**
+     * Removes and replaces necessary characters in the argument text, so that the screenshot file name can be built properly.
+     *
+     * @param text the text to normalize
+     * @return the normalized text
+     */
+    protected String normalize(String text) {
+        return text.replaceAll(DELIMITERS_TO_REPLACE, "_").replaceAll(CHARACTERS_TO_REPLACE, "-");
+    }
+
+    protected String parseTestId(String partialName) {
+        Matcher testIdMatcher = TEST_ID_PATTERN.matcher(partialName);
+        return testIdMatcher.find() ? testIdMatcher.group("testId") : partialName;
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/ScreenshotNameResolver.java b/src/main/java/com/picimako/terra/wdio/screenshot/ScreenshotNameResolver.java
new file mode 100644
index 0000000..91c87e1
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/ScreenshotNameResolver.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot;
+
+import com.intellij.codeInsight.hints.InlayHintsSink;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.PsiFile;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.screenshot.inlayhint.TerraScreenshotInlayHintsProvider;
+
+/**
+ * Based on a Terra screenshot validation call's name argument, it resolves the name of the actual screenshot it references.
+ * 
+ * Methods in this interface are not annotated as {@code @Nullable} due to type mismatch in
+ * {@link com.picimako.terra.wdio.screenshot.inlayhint.TerraScreenshotInlayHintsProvider#getCollectorFor(PsiFile, Editor, TerraScreenshotInlayHintsProvider.Settings, InlayHintsSink)}. 
+ */
+public interface ScreenshotNameResolver {
+
+    /**
+     * Resolves the name of the screenshot referenced by the argument JS literal expression. The argument element must be the first, name parameter
+     * of one of the screenshot validation calls:
+     * <ul>
+     *     <li>Terra.validates.screenshot</li>
+     *     <li>Terra.validates.element</li>
+     * </ul>
+     *
+     * @param element the JS literal expression on which the resolution takes place
+     * @return the resolved image name, or an empty string if the resolution couldn't happen
+     */
+    String resolveName(JSLiteralExpression element);
+
+    /**
+     * Resolves the name of the screenshot referenced by the argument method expression representing the method name part of
+     * of one of the screenshot validation calls.
+     * <p>
+     * This method is designed for the case when there is no name parameter specified in the screenshot validation calls,
+     * so that the terra library defaults to the value {@code default} for that part of the name.
+     * <p>
+     * This is applicable only to terra-toolkit based tests. This method is not supported in case of terra-functional-testing.
+     *
+     * @param methodExpression the method expression on which the resolution takes place
+     * @return the resolved image name, or an empty string if the resolution couldn't happen
+     */
+    String resolveDefaultName(JSExpression methodExpression);
+
+    /**
+     * If the first name argument is specified, then it resolves the screenshot name based on that, otherwise resolves
+     * the name by the method expression of the same JS call.
+     *
+     * @param firstNameArgument the first, name parameter of a validation call
+     * @param methodExpression  the method expression of the validation call
+     * @return the resolved name
+     */
+    String resolveWithFallback(@Nullable JSLiteralExpression firstNameArgument, JSExpression methodExpression);
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolver.java b/src/main/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolver.java
new file mode 100644
index 0000000..b106e5b
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolver.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot;
+
+import com.intellij.json.psi.JsonPsiUtil;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Terra-functional-testing specific implementation of name resolution.
+ * <p>
+ * This logic is based on
+ * <a href="https://github.com/cerner/terra-toolkit/blob/main/packages/terra-functional-testing/src/services/wdio-visual-regression-service/methods/BaseCompare.js">BaseCompare.js</a>.
+ * <p>
+ * The name of the image is resolved using the name parameter of Terra.validates calls.
+ * <p>
+ * In the final names of screenshots some characters are replaced, which is also handled when building the name of the image.
+ * For the list of characters replaced by underscore, see {@link #CHARACTERS_TO_REPLACE}.
+ * <p>
+ * There is a special logic to parse test ids from the validation calls' name parameter. In case of a test like
+ * <pre>
+ * describe('terra screenshot', () => {
+ *     it('Test case', () => {
+ *         Terra.validates.element('this is the [test id]', { selector: '#selector' });
+ *     });
+ * });
+ * </pre>
+ * the test id will be {@code test id}, while the built screenshot file name will be {@code test id.png},
+ * so not the full parameter value is used.
+ * <p>
+ * If there are multiple sections of the name parameter enclosed with [ and ], it is always the widest match that will be
+ * put into the resolved screenshot name.
+ * <p>
+ * However if the test id contains at least one ) character like, or the name parameter doesn't even have a portion enclosed
+ * by [ and ], the default logic takes place:
+ * <pre>
+ * describe('terra screenshot', () => {
+ *     it('Test case', () => {
+ *         Terra.validates.element('this is the [test ) id]', { selector: '#selector' });
+ *     });
+ * });
+ * </pre>
+ * the final screenshot name will be {@code this_is_the_[test_)_id].png}.
+ *
+ * @since 0.6.0
+ */
+public class TerraFunctionalTestingScreenshotNameResolver extends AbstractScreenshotNameResolver {
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * If the argument element is null, then the returned name is an empty string. This distinction makes sure that
+     * no logic is broken due to Terra.validates calls with no name parameters.
+     */
+    @Override
+    @NotNull
+    public String resolveName(JSLiteralExpression element) {
+        String resolved = "";
+        if (element != null) {
+            resolved = normalize(parseTestId(JsonPsiUtil.stripQuotes(element.getText())));
+            if (!resolved.isEmpty()) {
+                resolved += ".png";
+            }
+        }
+        return resolved;
+
+    }
+
+    @Override
+    @NotNull
+    public String resolveDefaultName(JSExpression methodExpression) {
+        throw new UnsupportedOperationException("Default screenshot names are not applicable to the terra-functional-testing library. " +
+            "This is a problem in the Terra Support plugin. Please create an issue at https://github.com/picimako/terra-support/issues");
+    }
+
+    @Override
+    @NotNull
+    public String resolveWithFallback(@Nullable JSLiteralExpression firstNameArgument, JSExpression methodExpression) {
+        return resolveName(firstNameArgument);
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollector.java b/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollector.java
index ba0b5b3..e5f4b81 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollector.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollector.java
@@ -34,6 +34,7 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
+import com.picimako.terra.wdio.TerraResourceManager;
 import com.picimako.terra.wdio.TerraWdioFolders;
 
 /**
@@ -55,11 +56,12 @@
  */
 public class TerraScreenshotCollector {
 
-    private final TerraScreenshotNameResolver screenshotNameResolver = new TerraScreenshotNameResolver();
+    private final ScreenshotNameResolver screenshotNameResolver;
     private final Project project;
 
     public TerraScreenshotCollector(Project project) {
         this.project = project;
+        screenshotNameResolver = TerraResourceManager.getInstance(project).screenshotNameResolver();
     }
 
     /**
@@ -113,6 +115,10 @@ public PsiElement[] collectForDefault(JSExpression methodExpression) {
      * @return the array of screenshots found
      */
     private PsiElement[] collect(PsiElement element, Supplier<String> nameSupplier) {
+        if (element == null || nameSupplier.get() == null) {
+            return PsiElement.EMPTY_ARRAY;
+        }
+
         PsiDirectory specFileDirectory = element.getContainingFile().getParent();
         if (specFileDirectory != null) {
             PsiDirectory snapshotsDirectory = specFileDirectory.findSubdirectory(TerraWdioFolders.SNAPSHOTS);
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolver.java b/src/main/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolver.java
similarity index 78%
rename from src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolver.java
rename to src/main/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolver.java
index 5045ac9..af1ccfb 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolver.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolver.java
@@ -18,9 +18,6 @@
 
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.TERRA_DESCRIBE_VIEWPORTS;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import com.intellij.json.psi.JsonPsiUtil;
 import com.intellij.lang.javascript.buildTools.JSPsiUtil;
 import com.intellij.lang.javascript.psi.JSCallExpression;
@@ -33,8 +30,9 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * This class, based on a Terra screenshot validation call's name argument, resolves the name of the actual screenshot
- * that it references. This logic is based on
+ * Terra-toolkit specific implementation of name resolution.
+ * <p>
+ * The resolution logic is based on
  * <a href="https://github.com/cerner/terra-toolkit-boneyard/blob/main/config/wdio/visualRegressionConf.js">visualRegressionConf.js</a>
  * in the terra-toolkit project.
  * <p>
@@ -75,33 +73,24 @@
  * </pre>
  * the final screenshot name will be {@code terra_screenshot_[this_is_the_[test_)_id]].png}.
  */
-public class TerraScreenshotNameResolver {
+public class TerraToolkitScreenshotNameResolver extends AbstractScreenshotNameResolver {
 
-    /**
-     * The regular expression for the character replacement can be found in
-     * <a href="https://github.com/cerner/terra-toolkit-boneyard/blob/main/config/wdio/visualRegressionConf.js">terra-toolkit-boneyard//visualRegressionConf.js</a>
-     */
-    private static final String DELIMITERS_TO_REPLACE = "\\s+|\\.|\\+";
-    private static final String CHARACTERS_TO_REPLACE = "[?<>/|*:+\"]";
-    private static final Pattern TEST_ID_PATTERN = Pattern.compile("\\[(?<testId>[^)]+)]");
     private static final DescribeOrViewportsBlockCondition DESCRIBE_OR_VIEWPORTS_BLOCK_CONDITION = new DescribeOrViewportsBlockCondition();
     public static final String DESCRIBE_BLOCK_PATTERN = "describe|describe\\.only|describe\\.skip";
 
     /**
-     * Resolves the name of the screenshot referenced by the argument JS literal expression. The argument element must be the first, name parameter
-     * of one of the screenshot validation calls:
+     * {@inheritDoc}
+     * <p>
+     * Additional validation helpers affected:
      * <ul>
-     *     <li>Terra.validates.screenshot</li>
-     *     <li>Terra.validates.element</li>
      *     <li>Terra.it.matchesScreenshot</li>
      *     <li>Terra.it.validatesElement</li>
      * </ul>
+     * <p>
      * Name resolution with this method cannot happen when the parent {@code describe} or {@code Terra.describeViewports} block's name is missing.
-     *
-     * @param element the JS literal expression on which the resolution takes place
-     * @return the resolved image name, or an empty string if the resolution couldn't happen
      */
     @NotNull
+    @Override
     public String resolveName(JSLiteralExpression element) {
         return resolve(element, JsonPsiUtil.stripQuotes(element.getText()));
     }
@@ -117,6 +106,7 @@ public String resolveName(JSLiteralExpression element) {
      * @return the resolved image name, or an empty string if the resolution couldn't happen
      */
     @NotNull
+    @Override
     public String resolveDefaultName(JSExpression methodExpression) {
         return resolve(methodExpression, "default");
     }
@@ -130,6 +120,7 @@ public String resolveDefaultName(JSExpression methodExpression) {
      * @return the resolved name
      */
     @NotNull
+    @Override
     public String resolveWithFallback(@Nullable JSLiteralExpression firstNameArgument, JSExpression methodExpression) {
         return firstNameArgument != null ? resolveName(firstNameArgument) : resolveDefaultName(methodExpression);
     }
@@ -145,21 +136,6 @@ private String resolve(PsiElement element, String partialName) {
         return "";
     }
 
-    private String parseTestId(String partialName) {
-        Matcher testIdMatcher = TEST_ID_PATTERN.matcher(partialName);
-        return testIdMatcher.find() ? testIdMatcher.group("testId") : partialName;
-    }
-
-    /**
-     * Removes and replaces necessary characters in the argument text, so that the screenshot file name can be built properly.
-     *
-     * @param text the text to normalize
-     * @return the normalized text
-     */
-    private String normalize(String text) {
-        return text.replaceAll(DELIMITERS_TO_REPLACE, "_").replaceAll(CHARACTERS_TO_REPLACE, "-");
-    }
-
     /**
      * Describes the condition to find the closest {@code describe} or {@code Terra.describeViewports} parent element
      * for a Psi element.
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java b/src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java
index 7c38307..b828bbc 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProvider.java
@@ -17,6 +17,8 @@
 package com.picimako.terra.wdio.screenshot.gutter;
 
 import static com.intellij.lang.javascript.buildTools.JSPsiUtil.getFirstArgumentAsStringLiteral;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerraToolkit;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.isScreenshotValidationCall;
 
 import java.util.Collection;
@@ -55,10 +57,10 @@ public class TerraScreenshotValidationLineMarkerProvider extends RelatedItemLine
 
     @Override
     protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Collection<? super RelatedItemLineMarkerInfo<?>> result) {
-        if (element instanceof JSCallExpression && isScreenshotValidationCall((JSCallExpression) element)) {
+        if (isUsingTerra(element.getProject()) && element instanceof JSCallExpression && isScreenshotValidationCall((JSCallExpression) element)) {
             JSCallExpression terraCallExpr = (JSCallExpression) element;
             JSLiteralExpression nameArgument = getFirstArgumentAsStringLiteral(terraCallExpr.getArgumentList());
-            if (nameArgument == null) {
+            if (isUsingTerraToolkit(element.getProject()) && nameArgument == null) {
                 JSExpression methodExpression = terraCallExpr.getMethodExpression();
                 if (methodExpression != null) {
                     PsiElement[] screenshots = new TerraScreenshotCollector(element.getProject()).collectForDefault(methodExpression);
@@ -72,7 +74,7 @@ protected void collectNavigationMarkers(@NotNull PsiElement element, @NotNull Co
                         }
                     }
                 }
-            } else {
+            } else if (nameArgument != null) {
                 result.add(NavigationGutterIconBuilder.create(ImagesIcons.ImagesFileType)
                     .setTargets(PsiElement.EMPTY_ARRAY)
                     .setTooltipText(TerraBundle.message("terra.wdio.screenshot.gutter.validation.on.this.line"))
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt b/src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt
index 6d8deb3..4ed90c3 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProvider.kt
@@ -33,8 +33,9 @@ import com.intellij.refactoring.suggested.startOffset
 import com.intellij.ui.layout.panel
 import com.intellij.util.ui.JBUI
 import com.picimako.terra.resources.TerraBundle
+import com.picimako.terra.wdio.TerraResourceManager
+import com.picimako.terra.wdio.TerraResourceManager.isUsingTerra
 import com.picimako.terra.wdio.TerraWdioPsiUtil.*
-import com.picimako.terra.wdio.screenshot.TerraScreenshotNameResolver
 import com.picimako.terra.wdio.screenshot.inspection.GlobalTerraSelectorRetriever
 import javax.swing.DefaultComboBoxModel
 import javax.swing.JComponent
@@ -63,7 +64,6 @@ import javax.swing.JComponent
  */
 class TerraScreenshotInlayHintsProvider : InlayHintsProvider<TerraScreenshotInlayHintsProvider.Settings> {
 
-    private val nameResolver = TerraScreenshotNameResolver()
     private val globalSelectorRetriever = GlobalTerraSelectorRetriever()
 
     companion object {
@@ -137,10 +137,11 @@ class TerraScreenshotInlayHintsProvider : InlayHintsProvider<TerraScreenshotInla
     override fun getCollectorFor(file: PsiFile, editor: Editor, settings: Settings, sink: InlayHintsSink): InlayHintsCollector? {
         return object : FactoryInlayHintsCollector(editor) {
             override fun collect(element: PsiElement, editor: Editor, sink: InlayHintsSink): Boolean {
-                if (!file.project.service<DumbService>().isDumb && element is JSCallExpression && isScreenshotValidationCall(element)) {
+                if (isUsingTerra(element.project) && !file.project.service<DumbService>().isDumb && element is JSCallExpression && isScreenshotValidationCall(element)) {
                     var addedInlineScreenshot = false
                     if (settings.showScreenshotName != InlayType.Disabled) {
                         val nameExpr = getFirstArgumentAsStringLiteral(element.argumentList);
+                        val nameResolver = TerraResourceManager.getInstance(element.project).screenshotNameResolver();
                         val screenshotName = nameResolver.resolveWithFallback(nameExpr, element.methodExpression);
                         when (settings.showScreenshotName) {
                             InlayType.Inline -> {
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspection.java
new file mode 100644
index 0000000..041bb3a
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspection.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerraFunctionalTesting;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isInContextOfNonTerraItElementOrScreenshotValidation;
+
+import java.util.Map;
+
+import com.intellij.codeInspection.LocalInspectionToolSession;
+import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.codeInspection.SmartHashMap;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSFile;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.psi.PsiElementVisitor;
+import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraWdioInspectionBase;
+
+/**
+ * Reports duplicate screenshot names when using terra-functional-testing since more than the same screenshot
+ * <p>
+ * This inspection applies only to terra-functional-testing, so it is not enforced for terra-toolkit here either.
+ * <p>
+ * See the last part of
+ * <a href="https://engineering.cerner.com/terra-ui/dev_tools/cerner-terra-toolkit-docs/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#upgrading-tests">Terra Upgrade guide/Upgrading Tests</a>.
+ * 
+ * @since 0.6.0
+ */
+public class DuplicateScreenshotNameInspection extends TerraWdioInspectionBase {
+
+    @Override
+    public @NotNull String getShortName() {
+        return "DuplicateScreenshotName";
+    }
+
+    /**
+     * The inspection logic approaches the checks from the literal expressions' direction: instead of going through each JSExpressionStatement in the file,
+     * it iterates through the literal expressions, based on the presumption that there are probably less literal expressions in a spec file than expression statements,
+     * thus executing less precondition checks.
+     * <p>
+     * Only the first two matches are registered to make the inspection a bit more performant. Also I don't anticipate it is often to have more than two validations referencing the same screenshot.
+     */
+    @Override
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerraFunctionalTesting(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSFile(JSFile file) {
+                final Map<String, JSExpression> duplicateNames = new SmartHashMap<>();
+                PsiTreeUtil.processElements(session.getFile(), JSLiteralExpression.class, element -> {
+                    //The check and reporting is applied only to Terra.validates.element and Terra.validates.screenshot calls,
+                    //so there is no unnecessary execution for Terra.it calls which are removed from terra-functional-testing anyway.
+                    if (element.isStringLiteral() && isInContextOfNonTerraItElementOrScreenshotValidation(element)) {
+                        if (duplicateNames.containsKey(element.getStringValue())) {
+                            holder.registerProblem(duplicateNames.get(element.getStringValue()), TerraBundle.inspection("duplicate.screenshot.name"));
+                            holder.registerProblem(element, TerraBundle.inspection("duplicate.screenshot.name"));
+                            return false;
+                        }
+                        duplicateNames.put(element.getStringValue(), element);
+                    }
+                    return true;
+                });
+            }
+        };
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java
index 7b1b564..af4f646 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspection.java
@@ -17,12 +17,15 @@
 package com.picimako.terra.wdio.screenshot.inspection;
 
 import static com.intellij.lang.javascript.buildTools.JSPsiUtil.getStringLiteralValue;
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.SELECTOR;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getScreenshotValidationProperty;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraElementOrScreenshotValidation;
 
 import java.util.Objects;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -57,13 +60,17 @@ public class GlobalTerraSelectorInspection extends TerraWdioInspectionBase {
     }
 
     @Override
-    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTerraElementOrScreenshotValidationFunction(node)) {
+                if (isTerraElementOrScreenshotValidation(node)) {
                     JSProperty selectorProperty = getScreenshotValidationProperty(node, SELECTOR);
                     if (selectorProperty != null) {
                         String screenshotSelector = getStringLiteralValue(selectorProperty.getValue());
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraValidationPropertiesInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraValidationPropertiesInspection.java
new file mode 100644
index 0000000..fc42650
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraValidationPropertiesInspection.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.getTerraValidationProperties;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isAccessibilityValidation;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isElementValidation;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isScreenshotValidation;
+
+import java.util.List;
+import java.util.Optional;
+
+import com.intellij.codeInspection.LocalInspectionToolSession;
+import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpressionStatement;
+import com.intellij.psi.PsiElementVisitor;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.TerraWdioInspectionBase;
+
+/**
+ * This inspection reports JS properties of {@code Terra.it} and {@code Terra.validates} helpers,
+ * that are not valid.
+ * <p>
+ * terra-toolkit and terra-functional-testing specific properties are handled as well.
+ *
+ * @see TerraToolkitPropertiesProvider
+ * @see TerraFunctionalTestingPropertiesProvider
+ * @since 0.6.0
+ */
+public class InvalidTerraValidationPropertiesInspection extends TerraWdioInspectionBase {
+
+    @Override
+    public @NotNull String getShortName() {
+        return "InvalidTerraValidationProperties";
+    }
+
+    @Override
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSExpressionStatement(JSExpressionStatement node) {
+                super.visitJSExpressionStatement(node);
+
+                TerraPropertiesProvider properties = TerraResourceManager.getInstance(node.getProject()).screenshotValidationProperties();
+                if (isScreenshotValidation(node)) {
+                    checkIncorrectPropertyName(node, holder, properties.screenshotProperties());
+                } else if (isElementValidation(node)) {
+                    checkIncorrectPropertyName(node, holder, properties.elementProperties());
+                } else if (isAccessibilityValidation(node)) {
+                    checkIncorrectPropertyName(node, holder, properties.accessibilityProperties());
+                }
+            }
+        };
+    }
+
+    private void checkIncorrectPropertyName(JSExpressionStatement node, @NotNull ProblemsHolder holder, List<String> validPropertyNames) {
+        for (var property : getTerraValidationProperties(node)) {
+            if (!validPropertyNames.contains(property.getName())) {
+                holder.registerProblem(Optional.ofNullable(property.getIdentifyingElement()).orElse(property),
+                    TerraBundle.inspection("invalid.terra.validation.property", validPropertyNames));
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java
index e294fa5..ec3f8e6 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspection.java
@@ -16,8 +16,11 @@
 
 package com.picimako.terra.wdio.screenshot.inspection;
 
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraElementOrScreenshotValidation;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.buildTools.JSPsiUtil;
@@ -38,8 +41,6 @@
  * screenshot exists, and if there's none, then reports the problem.
  * <p>
  * In case the name parameter is not specified, the default value {@code default} is used for the screenshot lookup.
- * <p>
- * For screenshot name resolution see {@link com.picimako.terra.wdio.screenshot.TerraScreenshotNameResolver}.
  *
  * @since 0.2.0
  */
@@ -51,13 +52,17 @@ public class MissingScreenshotInspection extends TerraWdioInspectionBase {
     }
 
     @Override
-    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTerraElementOrScreenshotValidationFunction(node)) {
+                if (isTerraElementOrScreenshotValidation(node)) {
                     JSExpression callExpression = node.getExpression();
                     if (callExpression instanceof JSCallExpression) {
                         TerraScreenshotCollector screenshotCollector = new TerraScreenshotCollector(holder.getProject());
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspection.java
new file mode 100644
index 0000000..df87258
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspection.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerraFunctionalTesting;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isNonTerraItElementOrScreenshotValidation;
+
+import com.intellij.codeInspection.LocalInspectionToolSession;
+import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.lang.javascript.buildTools.JSPsiUtil;
+import com.intellij.lang.javascript.psi.JSElementVisitor;
+import com.intellij.lang.javascript.psi.JSExpressionStatement;
+import com.intellij.psi.PsiElementVisitor;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.psi.js.JSArgumentUtil;
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraWdioInspectionBase;
+import com.picimako.terra.wdio.TerraWdioPsiUtil;
+
+/**
+ * Reports problems when the screenshot name parameter of {@code Terra.validates.element} and
+ * {@code Terra.validates screenshot} calls are missing, since it is mandatory in terra-functional-testing.
+ * <p>
+ * This inspection applies only to terra-functional-testing, so it is not enforced for terra-toolkit here either.
+ *
+ * @since 0.6.0
+ */
+public class MissingScreenshotNameInspection extends TerraWdioInspectionBase {
+
+    @Override
+    public @NotNull String getShortName() {
+        return "MissingScreenshotName";
+    }
+
+    @Override
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerraFunctionalTesting(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
+        return new JSElementVisitor() {
+            @Override
+            public void visitJSExpressionStatement(JSExpressionStatement node) {
+                if (isNonTerraItElementOrScreenshotValidation(node)) {
+                    String nameArgument = JSPsiUtil.getFirstArgumentAsString(JSArgumentUtil.getArgumentListOf(node));
+                    if (nameArgument == null) {
+                        var methodExpression = TerraWdioPsiUtil.getMethodExpressionOf(node);
+                        if (methodExpression != null) {
+                            holder.registerProblem(methodExpression, TerraBundle.inspection("screenshot.name.argument.missing"));
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java
index 574d474..a15f876 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceBlockingInspection.java
@@ -16,11 +16,15 @@
 
 package com.picimako.terra.wdio.screenshot.inspection;
 
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.MISMATCH_TOLERANCE;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.MIS_MATCH_TOLERANCE;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getScreenshotValidationProperty;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraElementOrScreenshotValidation;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -59,24 +63,19 @@ public String getShortName() {
         return "ScreenshotMismatchToleranceBlocking";
     }
 
-//    @Override
-//    public JComponent createOptionsPanel() {
-//        final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
-//        panel.addCheckbox("Report values outside of boundaries (outside of 0-100)", "reportMismatchToleranceOutsideOfBoundaries");
-//        panel.addCheckbox("Report non-numeric values", "reportMismatchToleranceIsNonNumeric");
-//        return panel;
-//    }
-
     @Override
-    @NotNull
-    public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTerraElementOrScreenshotValidationFunction(node)) {
-                    JSProperty misMatchToleranceProperty = getScreenshotValidationProperty(node, MISMATCH_TOLERANCE);
+                if (isTerraElementOrScreenshotValidation(node)) {
+                    JSProperty misMatchToleranceProperty = getScreenshotValidationProperty(node, MIS_MATCH_TOLERANCE, MISMATCH_TOLERANCE);
                     if (misMatchToleranceProperty != null) {
                         checkForMismatchToleranceOutsideOfBoundaries(misMatchToleranceProperty, reportMismatchToleranceOutsideOfBoundaries, holder);
                         if (misMatchToleranceProperty.getValue() instanceof JSLiteralExpression) {
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java
index 9b755c8..d1d9107 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceInspection.java
@@ -16,15 +16,19 @@
 
 package com.picimako.terra.wdio.screenshot.inspection;
 
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.MISMATCH_TOLERANCE;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.MIS_MATCH_TOLERANCE;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getScreenshotValidationProperty;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraElementOrScreenshotValidation;
 
 import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import javax.swing.*;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -39,7 +43,8 @@
 import com.picimako.terra.wdio.TerraWdioInspectionBase;
 
 /**
- * Reports problems regarding the {@code misMatchTolerance} property of screenshot validation function parameters.
+ * Reports problems regarding the {@code misMatchTolerance} or {@code mismatchTolerance} property of screenshot
+ * validation function parameters.
  * <p>
  * The validations in this inspection all report problems that would not block test execution.
  *
@@ -83,15 +88,18 @@ public JComponent createOptionsPanel() {
     }
 
     @Override
-    @NotNull
-    public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTerraElementOrScreenshotValidationFunction(node)) {
-                    JSProperty misMatchToleranceProperty = getScreenshotValidationProperty(node, MISMATCH_TOLERANCE);
+                if (isTerraElementOrScreenshotValidation(node)) {
+                    JSProperty misMatchToleranceProperty = getScreenshotValidationProperty(node, MIS_MATCH_TOLERANCE, MISMATCH_TOLERANCE);
                     if (misMatchToleranceProperty != null && misMatchToleranceProperty.getValue() instanceof JSLiteralExpression) {
                         JSLiteralExpression literal = (JSLiteralExpression) misMatchToleranceProperty.getValue();
                         if (literal.isNumericLiteral()) {
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java
index 6b33a1c..c6655a6 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspection.java
@@ -16,8 +16,11 @@
 
 package com.picimako.terra.wdio.screenshot.inspection;
 
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.isTerraItMatchesScreenshot;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -43,20 +46,21 @@ public String getShortName() {
     }
 
     @Override
-    @NotNull
-    public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @SuppressWarnings("ConstantConditions")
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node)) {
-                    if (isTerraItMatchesScreenshotExpression(node)) {
-                        holder.registerProblem(getTerraValidationFunctionNameElement(node), TerraBundle.inspection("it.validateselement.preferred"));
-                    } else if (isTerraValidatesScreenshotExpression(node)) {
-                        holder.registerProblem(getTerraValidationFunctionNameElement(node), TerraBundle.inspection("validates.element.preferred"));
-                    }
+                if (isTerraItMatchesScreenshot(node)) {
+                    holder.registerProblem(getTerraValidationFunctionNameElement(node), TerraBundle.inspection("it.validateselement.preferred"));
+                } else if (isTerraValidatesScreenshotExpression(node)) {
+                    holder.registerProblem(getTerraValidationFunctionNameElement(node), TerraBundle.inspection("validates.element.preferred"));
                 }
             }
         };
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraFunctionalTestingPropertiesProvider.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraFunctionalTestingPropertiesProvider.java
new file mode 100644
index 0000000..6e627d9
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraFunctionalTestingPropertiesProvider.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.MISMATCH_TOLERANCE;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.RULES;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.SELECTOR;
+
+import java.util.List;
+
+/**
+ * Terra-functional-testing specific properties provider.
+ *
+ * @since 0.6.0
+ */
+public class TerraFunctionalTestingPropertiesProvider implements TerraPropertiesProvider {
+
+    private static final List<String> SCREENSHOT_PROPERTIES = List.of(MISMATCH_TOLERANCE, SELECTOR);
+    private static final List<String> ELEMENT_PROPERTIES = List.of(SELECTOR, MISMATCH_TOLERANCE, RULES);
+    private static final List<String> ACCESSIBILITY_PROPERTIES = List.of(RULES);
+
+    @Override
+    public List<String> screenshotProperties() {
+        return SCREENSHOT_PROPERTIES;
+    }
+
+    @Override
+    public List<String> elementProperties() {
+        return ELEMENT_PROPERTIES;
+    }
+
+    @Override
+    public List<String> accessibilityProperties() {
+        return ACCESSIBILITY_PROPERTIES;
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraPropertiesProvider.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraPropertiesProvider.java
new file mode 100644
index 0000000..6ec7378
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraPropertiesProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import java.util.List;
+
+/**
+ * Provides Terra specific JS property values for various helpers.
+ * <p>
+ * Although the properties could be retrieved as a Set, to keep the order of them fix and deterministic, List is used
+ * instead.
+ *
+ * @since 0.6.0
+ */
+public interface TerraPropertiesProvider {
+
+    /**
+     * For Terra.it.matchesScreenshot and Terra.validates.screenshot.
+     */
+    List<String> screenshotProperties();
+
+    /**
+     * For Terra.it.validatesElement and Terra.validates.element.
+     */
+    List<String> elementProperties();
+
+    /**
+     * For Terra.it.isAccessible and Terra.validates.accessibility.
+     */
+    List<String> accessibilityProperties();
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraToolkitPropertiesProvider.java b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraToolkitPropertiesProvider.java
new file mode 100644
index 0000000..bc66f79
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/inspection/TerraToolkitPropertiesProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.AXE_RULES;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.MIS_MATCH_TOLERANCE;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.SELECTOR;
+import static com.picimako.terra.wdio.TerraWdioPsiUtil.VIEWPORTS;
+
+import java.util.List;
+
+/**
+ * Terra-toolkit specific properties provider.
+ *
+ * @since 0.6.0
+ */
+public class TerraToolkitPropertiesProvider implements TerraPropertiesProvider {
+
+    private static final List<String> SCREENSHOT_PROPERTIES = List.of(MIS_MATCH_TOLERANCE, SELECTOR, VIEWPORTS);
+    private static final List<String> ELEMENT_PROPERTIES = List.of(SELECTOR, MIS_MATCH_TOLERANCE, AXE_RULES);
+    private static final List<String> ACCESSIBILITY_PROPERTIES = List.of(AXE_RULES);
+
+    @Override
+    public List<String> screenshotProperties() {
+        return SCREENSHOT_PROPERTIES;
+    }
+
+    @Override
+    public List<String> elementProperties() {
+        return ELEMENT_PROPERTIES;
+    }
+
+    @Override
+    public List<String> accessibilityProperties() {
+        return ACCESSIBILITY_PROPERTIES;
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotPsiFile.java b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotPsiFile.java
index 6d09152..8f50f65 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotPsiFile.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotPsiFile.java
@@ -25,7 +25,8 @@
 import icons.ImagesIcons;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.imagepreview.ScreenshotContextParser;
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.ScreenshotContextParser;
 
 /**
  * A wrapper class for a binary file, specifically for the screenshot images, so that their representation in the
@@ -36,11 +37,12 @@
  */
 final class TerraScreenshotPsiFile extends PsiBinaryFileImpl {
 
-    private final ScreenshotContextParser contextParser = new ScreenshotContextParser("/");
+    private final ScreenshotContextParser contextParser;
     private final PsiFile originalElement;
 
     TerraScreenshotPsiFile(PsiFile originalElement) {
         super((PsiManagerImpl) originalElement.getManager(), originalElement.getViewProvider());
+        contextParser = TerraResourceManager.getInstance(getProject()).screenshotContextParser("/");
         this.originalElement = originalElement;
     }
 
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReference.java b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReference.java
index 17d0f58..50f4391 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReference.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReference.java
@@ -16,6 +16,8 @@
 
 package com.picimako.terra.wdio.screenshot.reference;
 
+import static com.picimako.terra.wdio.TerraWdioFolders.isReferenceScreenshot;
+
 import java.util.Arrays;
 
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
@@ -30,13 +32,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraWdioFolders;
 import com.picimako.terra.wdio.screenshot.TerraScreenshotCollector;
-import com.picimako.terra.wdio.screenshot.TerraScreenshotNameResolver;
 
 /**
  * A reference implementation for Terra screenshots. The reference is for placing it on screenshot validation calls
- * (see the javadoc of {@link TerraScreenshotNameResolver#resolveName(JSLiteralExpression)} and it's class-level documentation).
+ * (see the javadoc of {@link com.picimako.terra.wdio.screenshot.ScreenshotNameResolver#resolveName(JSLiteralExpression)}
+ * and it's implementations' documentation).
  * <p>
  * Although file search based on the image's name would return the latest and diff versions of images, the list is filtered,
  * so that only the reference ones are returned for now.
@@ -59,7 +60,7 @@ public TerraScreenshotReference(@NotNull PsiElement element) {
     }
 
     @Override
-    public @NotNull ResolveResult[] multiResolve(boolean incompleteCode) {
+    public ResolveResult @NotNull [] multiResolve(boolean incompleteCode) {
         if (!incompleteCode) {
             PsiFile[] screenshotsForName = screenshotCollector.collectAsPsiFilesFor((JSLiteralExpression) myElement);
             //TODO: idea: reorder the suggestions based on locale, browser and viewport to get a consistently ordered list
@@ -71,7 +72,7 @@ public TerraScreenshotReference(@NotNull PsiElement element) {
     @NotNull
     private ResolveResult[] createResultItemsFor(PsiFile[] screenshotsForName, Project project) {
         return Arrays.stream(screenshotsForName)
-            .filter(screenshot -> TerraWdioFolders.isReferenceScreenshot(screenshot.getVirtualFile(), project)) //show only reference images
+            .filter(screenshot -> isReferenceScreenshot(screenshot.getVirtualFile(), project)) //show only reference images
             .map(TerraScreenshotPsiFile::new)
             .map(PsiElementResolveResult::new)
             .toArray(ResolveResult[]::new);
diff --git a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java
index c9b263a..1111018 100644
--- a/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java
+++ b/src/main/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceContributor.java
@@ -22,7 +22,6 @@
 
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.openapi.util.Condition;
 import com.intellij.patterns.PlatformPatterns;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
@@ -51,9 +50,10 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
         registrar.registerReferenceProvider(PlatformPatterns.psiElement(JSLiteralExpression.class),
             new PsiReferenceProvider() {
                 @Override
-                public @NotNull PsiReference[] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
+                public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement element, @NotNull ProcessingContext context) {
                     if (isJSStringLiteral(element)) {
-                        PsiElement parentDescribeCall = PsiTreeUtil.findFirstParent(element, new ScreenshotValidationCallCondition());
+                        PsiElement parentDescribeCall = PsiTreeUtil.findFirstParent(element,
+                            psiElement -> psiElement instanceof JSCallExpression && isScreenshotValidationCall((JSCallExpression) psiElement));
                         if (parentDescribeCall != null) {
                             JSLiteralExpression describeBlockName = getFirstArgumentAsStringLiteral(((JSCallExpression) parentDescribeCall).getArgumentList());
                             if (describeBlockName == element) {
@@ -65,15 +65,4 @@ public void registerReferenceProviders(@NotNull PsiReferenceRegistrar registrar)
                 }
             });
     }
-
-    /**
-     * Describes the condition to find the JSCallExpression a screenshot partial name is located in as its first parameter.
-     */
-    private static final class ScreenshotValidationCallCondition implements Condition<PsiElement> {
-        @Override
-        public boolean value(PsiElement psiElement) {
-            return psiElement instanceof JSCallExpression
-                && isScreenshotValidationCall((JSCallExpression) psiElement);
-        }
-    }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeModel.java b/src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeModel.java
new file mode 100644
index 0000000..4381f9d
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeModel.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.toolwindow;
+
+import static com.picimako.terra.wdio.TerraWdioFolders.collectSpecFiles;
+import static com.picimako.terra.wdio.TerraWdioFolders.existsAfterRefresh;
+import static com.picimako.terra.wdio.TerraWdioFolders.projectWdioRoot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import javax.swing.event.TreeModelListener;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraWdioFolders;
+import com.picimako.terra.wdio.toolwindow.node.AbstractTerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
+
+/**
+ * Contains common logic for building tree models.
+ *
+ * @see TerraWdioTreeModel
+ */
+public abstract class AbstractTerraWdioTreeModel implements TreeModel {
+
+    private Disposable rootDisposable;
+    protected TreeModelDataRoot data;
+    protected final Project project;
+
+    public AbstractTerraWdioTreeModel(Project project) {
+        this.project = project;
+        buildTree();
+    }
+
+    /**
+     * Builds the contents of the tree model that is shown in the tool window.
+     * <p>
+     * It uses only a single wdio root path among the ones defined in the Terra Support Settings, first found in the project.
+     * <p>
+     * <b>Disposer logic</b>
+     * <p>
+     * Clears all virtual files and nodes saved in the model.
+     * <p>
+     * Since changes can and do occur in the project, that are not initiated from the Terra wdio tool window, these external
+     * changes, depending on their nature, might have to be reflected on the tool window UI, and the tree model behind it.
+     * <p>
+     * The current approach is to rebuild the tree model within the same root node object, instead of finding the proper object
+     * in the model, corresponding to the actual change in the file system (rename, delete, create, etc.), and modify the same
+     * model to reflect the change.
+     * <p>
+     * This approach also means that with each file system change/event, and model rebuild, there are many objects left behind
+     * that will require garbage collection short and long-term, but with each such event, the number of such objects may
+     * rise significantly.
+     * <p>
+     * To help mitigate this problem, and signal to the garbage collector that these objects can be cleaned up, each collection
+     * within the model and its nodes are cleared (set to null).
+     * <p>
+     * The current approach is simpler, requires less code and complexity to maintain, compared to the other approach.
+     * <p>
+     * In case of any memory leak, or if significant memory consumption is experienced by users, this approach may need to be re-considered
+     * for alteration.
+     */
+    public void buildTree() {
+        VirtualFile wdioFolder = projectWdioRoot(project);
+        if (wdioFolder != null) {
+            if (data == null) {
+                data = new TreeModelDataRoot(TerraBundle.toolWindow("root.node.name"), project);
+            } else {
+                Disposer.dispose(rootDisposable);
+            }
+            rootDisposable = Disposer.newDisposable();
+            Disposer.register(rootDisposable, data);
+
+            wdioFolder.refresh(false, true);
+            List<VirtualFile> filesAndFoldersAnywhereInWdioRoot = VfsUtil.collectChildrenRecursively(wdioFolder);
+            Set<VirtualFile> specFiles = collectSpecFiles(filesAndFoldersAnywhereInWdioRoot);
+            collectSpecsAndScreenshots(filesAndFoldersAnywhereInWdioRoot, specFiles, TerraWdioFolders.REFERENCE, AbstractTerraWdioTreeNode::addReference);
+            collectSpecsAndScreenshots(filesAndFoldersAnywhereInWdioRoot, specFiles, TerraWdioFolders.DIFF, (node, vf) -> asScreenshot(node).addDiff(vf));
+            collectSpecsAndScreenshots(filesAndFoldersAnywhereInWdioRoot, specFiles, TerraWdioFolders.LATEST, (node, vf) -> asScreenshot(node).addLatest(vf));
+
+            data.getSpecs().forEach(TreeSpecNode::reorderScreenshotsAlphabeticallyByDisplayName);
+        }
+    }
+
+    protected void populateSpecNodeWithFolderAndScreenshots(VirtualFile folder, @NotNull VirtualFile[] screenshots,
+                                                            TreeSpecNode specNode, VirtualFileToNodeAdder virtualFileToNodeAdder,
+                                                            @NotNull String imageType) {
+        //Save folder virtual files only when they belong to the reference version, and not to the latest or diff
+        if (TerraWdioFolders.REFERENCE.equals(imageType)) {
+            virtualFileToNodeAdder.accept(specNode, folder);
+        }
+        for (VirtualFile screenshot : screenshots) {
+            if (existsAfterRefresh(screenshot)) {
+                specNode.findScreenshotNodeByName(screenshot.getName())
+                    //If one or more screenshot node have already been added with a given name
+                    .ifPresentOrElse(s -> virtualFileToNodeAdder.accept(s, screenshot),
+                        //If a screenshot node hasn't been added
+                        () -> {
+                            TreeScreenshotNode newScreenshotNode = TerraWdioTreeNode.forScreenshot(screenshot.getName(), project);
+                            virtualFileToNodeAdder.accept(newScreenshotNode, screenshot);
+                            specNode.addScreenshot(newScreenshotNode);
+                            Disposer.register(specNode, newScreenshotNode);
+                        });
+            }
+        }
+    }
+
+    protected abstract void collectSpecsAndScreenshots(@NotNull List<VirtualFile> filesAndFoldersAnywhereInWdioRoot, Set<VirtualFile> specFiles,
+                                                       @NotNull String imageType, @NotNull VirtualFileToNodeAdder virtualFileToNodeAdder);
+
+    // The methods below are responsible for building the actual tree model from the backing model data.
+
+    @Override
+    public Object getRoot() {
+        return data;
+    }
+
+    @Override
+    public void valueForPathChanged(TreePath path, Object newValue) {
+    }
+
+    @Override
+    public void addTreeModelListener(TreeModelListener l) {
+    }
+
+    @Override
+    public void removeTreeModelListener(TreeModelListener l) {
+    }
+
+    @FunctionalInterface
+    protected interface VirtualFileToNodeAdder extends BiConsumer<AbstractTerraWdioTreeNode, VirtualFile> {
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsAction.java
index ea0ed13..d01f8af 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsAction.java
@@ -32,11 +32,16 @@
 import com.intellij.lang.javascript.psi.JSLiteralExpression;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
-import com.picimako.terra.wdio.screenshot.TerraScreenshotNameResolver;
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.screenshot.ScreenshotNameResolver;
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * An action for the Terra Wdio tool window for collecting unused wdio screenshots in the project and marking them
@@ -52,7 +57,7 @@
  *         then remove it from the collection of screenshot names.
  *     </li>
  *     <li>If any screenshot names remain, those ones will be the unused ones, and they are marked with a red exclamation mark
- *     icon. See {@link TerraWdioTreeCellRenderer}.</li>
+ *     icon. See {@link TerraWdioTree.TerraWdioNodeRenderer}.</li>
  * </ol>
  * Processing of the screenshot validation calls quits as soon as there is no more screenshot name left in the original
  * collection, meaning that all screenshots are used. This makes sure that no file is processed unnecessarily after
@@ -74,17 +79,18 @@
  * window will not be marked as unused, only when the code part of it is removed as well.
  *
  * @see TerraWdioToolWindowFactory
- * @see TerraWdioTreeCellRenderer
+ * @see TerraWdioTree.TerraWdioNodeRenderer
  * @since 0.3.0
  */
 final class FindUnusedScreenshotsAction extends AnAction {
 
-    private final TerraScreenshotNameResolver resolver = new TerraScreenshotNameResolver();
+    private final ScreenshotNameResolver resolver;
     private final TerraWdioTree tree;
 
-    FindUnusedScreenshotsAction(TerraWdioTree tree) {
+    FindUnusedScreenshotsAction(TerraWdioTree tree, Project project) {
         super(toolWindow("find.unused.screenshots"), toolWindow("find.unused.screenshots.description"), AllIcons.Actions.Execute);
         this.tree = tree;
+        resolver = TerraResourceManager.getInstance(project).screenshotNameResolver();
     }
 
     @Override
@@ -92,7 +98,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
         final List<PsiFile> specFiles = new ArrayList<>();
         collectSpecFiles(findDirectory(e.getProject(), wdioRootRelativePath(e.getProject())), specFiles);
 
-        TerraWdioTreeModelDataRoot root = (TerraWdioTreeModelDataRoot) tree.getModel().getRoot();
+        TreeModelDataRoot root = (TreeModelDataRoot) tree.getModel().getRoot();
         final List<String> screenshotPaths = markUsedAndGetAllScreenshotPaths(root);
 
         for (PsiFile specFile : specFiles) {
@@ -118,10 +124,10 @@ public void actionPerformed(@NotNull AnActionEvent e) {
      *
      * @return the list of screenshot names in the project
      */
-    private List<String> markUsedAndGetAllScreenshotPaths(TerraWdioTreeModelDataRoot root) {
-        final List<String> names = new ArrayList<>();
-        for (TerraWdioTreeSpecNode spec : root.getSpecs()) {
-            for (TerraWdioTreeScreenshotNode screenshot : spec.getScreenshots()) {
+    private List<String> markUsedAndGetAllScreenshotPaths(TreeModelDataRoot root) {
+        final List<String> names = new SmartList<>();
+        for (var spec : root.getSpecs()) {
+            for (var screenshot : spec.getScreenshots()) {
                 screenshot.setUnused(false);
                 names.add(spec.getDisplayName() + "/" + screenshot.getDisplayName());
             }
@@ -135,9 +141,9 @@ private List<String> markUsedAndGetAllScreenshotPaths(TerraWdioTreeModelDataRoot
      * @param root            the root node of the tree model containing the spec and screenshot nodes
      * @param screenshotPaths the collection of screenshot names to mark unused
      */
-    private void markScreenshotsAsUnused(TerraWdioTreeModelDataRoot root, List<String> screenshotPaths) {
-        for (TerraWdioTreeSpecNode spec : root.getSpecs()) {
-            for (TerraWdioTreeScreenshotNode screenshot : spec.getScreenshots()) {
+    private void markScreenshotsAsUnused(TreeModelDataRoot root, List<String> screenshotPaths) {
+        for (var spec : root.getSpecs()) {
+            for (var screenshot : spec.getScreenshots()) {
                 for (String screenshotPath : screenshotPaths) {
                     if (screenshotPath.equals(spec.getDisplayName() + "/" + screenshot.getDisplayName())) {
                         screenshot.setUnused(true);
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListener.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListener.java
index f567b25..6b14d54 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListener.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListener.java
@@ -29,6 +29,7 @@
 import com.picimako.terra.wdio.toolwindow.action.DeleteScreenshotsAction;
 import com.picimako.terra.wdio.toolwindow.action.RenameScreenshotsAction;
 import com.picimako.terra.wdio.toolwindow.action.ReplaceReferenceWithLatestAction;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * Terra wdio specific implementation of {@link BulkFileListener}.
@@ -47,7 +48,7 @@
  * See {@link TerraWdioScreenshotsPanel#TerraWdioScreenshotsPanel(Project)} for subscribing to the related topic.
  * <p>
  * TODO:
- * <b>Possible improvement option:</b>
+ * <b>Possible improvement options:</b>
  * <ul>
  *     <li>Update the tree only when the tool window is open.</li>
  *     <li>Additionally, update the tree only when the tool window is being opened. This of course needs handling of what if the tool
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioScreenshotsPanel.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioScreenshotsPanel.java
index 3e47aff..863b7b7 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioScreenshotsPanel.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioScreenshotsPanel.java
@@ -25,6 +25,7 @@
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.components.JBScrollPane;
 
 import com.picimako.terra.wdio.toolwindow.action.TerraWdioScreenshotActionsGroup;
@@ -33,6 +34,7 @@
 import com.picimako.terra.wdio.toolwindow.event.MouseListeningScreenshotNodeActionInvoker;
 import com.picimako.terra.wdio.toolwindow.event.ShortcutKeyListeningScreenshotNodeActionInvoker;
 import com.picimako.terra.wdio.toolwindow.event.ToolWindowPopupMenuInvoker;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * A custom tool window panel to contain and display the Terra wdio spec files and screenshots in a custom view.
@@ -66,6 +68,7 @@ private void buildGUI() {
         tree = new TerraWdioTree(new TerraWdioTreeModel(project));
         registerActionsAndListenersForTree();
         add(new JBScrollPane(tree));
+        new TreeSpeedSearch(tree);
     }
 
     public TerraWdioTree getTree() {
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactory.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactory.java
index 109e7ee..8b218c3 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactory.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactory.java
@@ -16,6 +16,8 @@
 
 package com.picimako.terra.wdio.toolwindow;
 
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
+
 import java.util.List;
 import javax.swing.*;
 
@@ -54,7 +56,7 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         addTab(toolWindow, screenshotsPanel);
         if (isSetTitleActionSupported()) {
             toolWindow.setTitleActions(List.of(
-                new FindUnusedScreenshotsAction(screenshotsPanel.getTree()),
+                new FindUnusedScreenshotsAction(screenshotsPanel.getTree(), project),
                 new ToggleStatisticsAction(() -> screenshotsPanel.getTree().updateUI())
             ));
         }
@@ -68,6 +70,10 @@ private void addTab(ToolWindow toolWindow, JComponent component) {
 
     @Override
     public boolean shouldBeAvailable(@NotNull Project project) {
+        if (!isUsingTerra(project)) {
+            return false;
+        }
+        
         boolean shouldBeAvailable = !project.isDefault();
         if (shouldBeAvailable) {
             VirtualFile wdioRoot = TerraWdioFolders.projectWdioRoot(project);
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTree.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTree.java
deleted file mode 100644
index ae9fe40..0000000
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTree.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.picimako.terra.wdio.toolwindow;
-
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asSpec;
-
-import java.util.Enumeration;
-import javax.swing.*;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
-
-/**
- * A custom Swing component for rendering a tree view for the Terra wdio components.
- * <p>
- * It uses the {@link TerraWdioTreeCellRenderer} to customize the appearance of the tree nodes.
- *
- * @see TerraWdioTreeModel
- */
-public class TerraWdioTree extends JTree {
-
-    /**
-     * Creates a tree component.
-     *
-     * @param model the underlying model containing the nodes of the tree
-     */
-    public TerraWdioTree(TreeModel model) {
-        super(model);
-        setCellRenderer(new TerraWdioTreeCellRenderer());
-        getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
-        setExpandsSelectedPaths(true);
-    }
-
-    /**
-     * Gets the parent node of the currently selected node as spec.
-     * <p>
-     * Call this only when you are sure that the currently selected node is a screenshot node.
-     *
-     * @return the parent spec node
-     */
-    public TerraWdioTreeSpecNode getParentSpecOfSelected() {
-        return asSpec(getSelectionPath().getParentPath().getLastPathComponent());
-    }
-
-    /**
-     * Gets the root node of this tree.
-     *
-     * @return the root node
-     */
-    public TerraWdioTreeModelDataRoot getRoot() {
-        return (TerraWdioTreeModelDataRoot) getModel().getRoot();
-    }
-
-    /**
-     * Gets all expanded nodes of this tree, the expanded descendants of the root node.
-     *
-     * @return the expanded nodes
-     */
-    public Enumeration<TreePath> getAllExpandedNodes() {
-        return getExpandedDescendants(new TreePath(getRoot()));
-    }
-
-    /**
-     * Restores the expansion state of nodes to a previous state (the argument expanded nodes).
-     *
-     * @param expandedNodes the previous state of nodes
-     */
-    public void restoreExpansionStateFrom(Enumeration<TreePath> expandedNodes) {
-        while (expandedNodes.hasMoreElements()) {
-            expandPath(expandedNodes.nextElement());
-        }
-    }
-}
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRenderer.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRenderer.java
deleted file mode 100644
index fe83c12..0000000
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRenderer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.picimako.terra.wdio.toolwindow;
-
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asSpec;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isSpec;
-
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.tree.DefaultTreeCellRenderer;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.util.PlatformIcons;
-import icons.ImagesIcons;
-
-/**
- * Tree cell rendered that configures each entry in the tree with an icon (at the left) and the name of the node (at the right).
- * <p>
- * The root node and specs are configured with a folder icon, while screenshots are customized with an image file icon.
- */
-public class TerraWdioTreeCellRenderer extends DefaultTreeCellRenderer {
-
-    public TerraWdioTreeCellRenderer() {
-        setOpaque(false);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <b>Terra wdio tool window cell rendering</b>
-     * <p>
-     * Screenshot nodes are marked with bold text in case they have at least one diff image.
-     * <p>
-     * Spec nodes are also marked with bold text if one of their underlying screenshots has at least one diff image.
-     */
-    @Override
-    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
-        super.getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row, hasFocus);
-        if (value instanceof TerraWdioTreeModelDataRoot) {
-            setIcon(PlatformIcons.FOLDER_ICON);
-            setFont(getFont().deriveFont(Font.PLAIN));
-        } else if (isSpec(value)) {
-            potentiallyMarkAsDiff(asSpec(value).getScreenshots().stream().anyMatch(TerraWdioTreeScreenshotNode::hasDiff));
-            markAsUnusedOrDefault(asSpec(value).getScreenshots().stream().anyMatch(TerraWdioTreeScreenshotNode::isUnused), PlatformIcons.FOLDER_ICON);
-        } else if (isScreenshot(value)) {
-            potentiallyMarkAsDiff(asScreenshot(value).hasDiff());
-            markAsUnusedOrDefault(asScreenshot(value).isUnused(), ImagesIcons.ImagesFileType);
-        }
-        setText(value.toString());
-
-        return this;
-    }
-
-    private void potentiallyMarkAsDiff(boolean hasDiff) {
-        setFont(getFont().deriveFont(hasDiff ? Font.BOLD : Font.PLAIN));
-    }
-
-    private void markAsUnusedOrDefault(boolean isOrHasUnused, Icon defaultIcon) {
-        setIcon(isOrHasUnused ? AllIcons.RunConfigurations.TestError : defaultIcon);
-    }
-}
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModel.java b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModel.java
index 2205837..5a035ec 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModel.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModel.java
@@ -16,51 +16,37 @@
 
 package com.picimako.terra.wdio.toolwindow;
 
-import static com.picimako.terra.wdio.TerraWdioFolders.collectSpecFiles;
-import static com.picimako.terra.wdio.TerraWdioFolders.collectSpecFoldersInside;
+import static com.picimako.terra.wdio.TerraWdioFolders.existsAfterRefresh;
 import static com.picimako.terra.wdio.TerraWdioFolders.projectWdioRoot;
 import static com.picimako.terra.wdio.TerraWdioFolders.specFolderIdentifier;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asSpec;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isSpec;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asSpec;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isSpec;
 
 import java.util.List;
 import java.util.Set;
-import java.util.function.BiConsumer;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
 
-import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraWdioFolders;
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * A model object for backing the {@link TerraWdioTree} UI component.
  * <p>
- * It maps the original folder structure of Terra wdio files, like this (having {@code tests/wdio} as the base folder):
+ * It maps the original folder structure of Terra wdio files (having {@code tests/wdio} as the base folder).
+ * <p>
+ * <b>For terra-toolkit:</b>
  * <pre>
  * - tests
  *     - wdio
  *         - __snapshots__
- *              - diff
- *                  - &lt;locale>
- *                      - &lt;browser>_&lt;viewport>
- *                          - &lt;spec file name>
- *                              - &lt;screenshot_1>.png
- *                          - &lt;another spec file name>
- *                              - &lt;screenshot_3>.png
- *              - latest
- *                  - &lt;locale>
- *                      - &lt;browser>_&lt;viewport>
- *                          - &lt;spec file name>
- *                              - &lt;screenshot_1>.png
  *              - reference
  *                  - &lt;locale>
  *                      - &lt;browser>_&lt;viewport>
@@ -68,8 +54,6 @@
  *                              - &lt;screenshot_1>.png
  *                              - &lt;screenshot_2>.png
  *                              - ...
- *              - reports
- *                  - result-&lt;browser>-&lt;application-name>.json
  *              - &lt;spec-file-name>-spec.js
  *              - &lt;another-spec-file-name>-spec.js
  *              - &lt;nestedfolder>
@@ -77,10 +61,30 @@
  *                 - __snapshots__
  *                     - &lt;screenshot folder structure>
  * </pre>
- * and creates a new, accumulated view for the Terra wdio tool window, so that users can handle multiple specs and screenshots with bulk commands:
+ * <b>For terra-functional-testing</b>
+ * <pre>
+ * - tests
+ *     - wdio
+ *         - __snapshots__
+ *              - reference
+ *                  - &lt;theme>
+ *                      - &lt;locale>
+ *                          - &lt;browser>_&lt;viewport>
+ *                              - &lt;spec file name>
+ *                                  - &lt;screenshot_1>.png
+ *                                  - &lt;screenshot_2>.png
+ *                                  - ...
+ *              - &lt;spec-file-name>-spec.js
+ *              - &lt;another-spec-file-name>-spec.js
+ *              - &lt;nestedfolder>
+ *                 - &lt;nested>-spec.js
+ *                 - __snapshots__
+ *                     - &lt;screenshot folder structure>
+ * </pre>
+ * It creates a new, accumulated view for the Terra wdio tool window, so that users can handle multiple specs and screenshots with bulk commands:
  * <pre>
  * - Wdio Resources                  <- This is the root node in the tree, which is permanent. It cannot be modified or removed.
- *      - &lt;spec file name>           <- A folder node referencing all spec folders and the related spec file with the same name.
+ *      - &lt;spec file name>           <- A folder node referencing all spec folders and the corresponding spec file with the same name.
  *          - &lt;screenshot_1>.png     <- A screenshot node referencing all screenshot files with the same name.
  *          - &lt;screenshot_2>.png
  *      - &lt;another spec file name>
@@ -91,85 +95,32 @@
  * This model also supports when spec JS files are in single or multiple subfolders within the base test path.
  * They are collected in the same way into this model.
  */
-public class TerraWdioTreeModel implements TreeModel {
-
-    private final Project project;
-    private TerraWdioTreeModelDataRoot data;
-    private Disposable rootDisposable;
+public class TerraWdioTreeModel extends AbstractTerraWdioTreeModel {
 
     public TerraWdioTreeModel(Project project) {
-        this.project = project;
-        buildTree();
-    }
-
-    /**
-     * Builds the contents of the tree model that is shown in the tool window.
-     * <p>
-     * It uses only a single wdio root path among the ones defined in the Terra Support Settings, first found in the project.
-     * <p>
-     * <b>Disposer logic</b>
-     * <p>
-     * Clears all virtual files and screenshot nodes saved in the model.
-     * <p>
-     * Since changes can and do occur in the project, that are not initiated from the Terra wdio tool window, these external
-     * changes, depending on their nature, might have to be reflected on the tool window UI, and the tree model behind it.
-     * <p>
-     * The current approach is to rebuild the tree model within the same root node object, instead of finding the proper object
-     * in the model, corresponding to the actual change in the file system (rename, delete, create, etc.), and modify the same
-     * model to reflect the change.
-     * <p>
-     * This approach also means that with each file system change/event, and model rebuild, there are many objects left behind
-     * that will require garbage collection short and long-term, but with each such event, the number of such objects may
-     * rise significantly.
-     * <p>
-     * To help mitigate this problem, and signal to the garbage collector that these objects can be cleaned up, each collection
-     * within the model and its nodes are cleared (set to null).
-     * <p>
-     * The current approach is simpler, requires less code and complexity to maintain, compared to the other approach.
-     * <p>
-     * In case of any memory leak, or if significant memory consumption is experienced by users, this approach may need to be re-considered
-     * for alteration.
-     */
-    public void buildTree() {
-        VirtualFile wdioFolder = projectWdioRoot(project);
-        if (wdioFolder != null) {
-            if (data == null) {
-                data = new TerraWdioTreeModelDataRoot("Wdio Resources", project);
-            } else {
-                Disposer.dispose(rootDisposable);
-            }
-            rootDisposable = Disposer.newDisposable();
-            Disposer.register(rootDisposable, data);
-
-            wdioFolder.refresh(false, true);
-            List<VirtualFile> filesAndFoldersInWdioRoot = VfsUtil.collectChildrenRecursively(wdioFolder);
-            Set<VirtualFile> specFiles = collectSpecFiles(filesAndFoldersInWdioRoot);
-            collectSpecsAndScreenshots(filesAndFoldersInWdioRoot, specFiles, TerraWdioFolders.REFERENCE, AbstractTerraWdioTreeNode::addReference);
-            collectSpecsAndScreenshots(filesAndFoldersInWdioRoot, specFiles, TerraWdioFolders.DIFF, (node, vf) -> asScreenshot(node).addDiff(vf));
-            collectSpecsAndScreenshots(filesAndFoldersInWdioRoot, specFiles, TerraWdioFolders.LATEST, (node, vf) -> asScreenshot(node).addLatest(vf));
-
-            data.getSpecs().forEach(TerraWdioTreeSpecNode::reorderScreenshotsAlphabeticallyByDisplayName);
-        }
+        super(project);
     }
 
-
-    private void collectSpecsAndScreenshots(@NotNull List<VirtualFile> filesAndFoldersInWdioRoot, Set<VirtualFile> specFiles,
-                                            @NotNull String imageType, @NotNull VirtualFileToNodeAdder virtualFileToNodeAdder) {
+    @Override
+    protected void collectSpecsAndScreenshots(@NotNull List<VirtualFile> filesAndFoldersAnywhereInWdioRoot, Set<VirtualFile> specFiles,
+                                              @NotNull String imageType, @NotNull VirtualFileToNodeAdder virtualFileToNodeAdder) {
         String wdioRootPath = projectWdioRoot(project).getPath();
         //This will have duplicate folders by name, but they are different folders
-        collectSpecFoldersInside(imageType, filesAndFoldersInWdioRoot)
+        TerraResourceManager.getInstance(project).specFolderCollector()
+            .collectSpecFoldersForTypeInside(imageType, filesAndFoldersAnywhereInWdioRoot)
             .forEach(folder -> {
                 VirtualFile[] screenshots = VfsUtil.getChildren(folder);
                 String folderIdentifier = specFolderIdentifier(folder, project);
                 data.getSpecs().stream()
                     .filter(spec -> spec.getDisplayName().equals(folderIdentifier)) //to make sure that the UI tree will contain a single node for a given spec name
                     .findFirst()
-                    //If the given spec folder (specNode) has already been added
-                    .ifPresentOrElse(specNode -> populateSpecNodeWithFolderAndScreenshots(folder, screenshots, specNode, virtualFileToNodeAdder, imageType),
+                    .ifPresentOrElse(
+                        //If the given spec folder (specNode) has already been added
+                        specNode -> populateSpecNodeWithFolderAndScreenshots(folder, screenshots, specNode, virtualFileToNodeAdder, imageType),
                         //If a given spec folder hasn't been added
                         () -> {
                             if (existsAfterRefresh(folder)) {
-                                TerraWdioTreeSpecNode specNode = TerraWdioTreeNode.forSpec(folderIdentifier, project);
+                                TreeSpecNode specNode = TerraWdioTreeNode.forSpec(folderIdentifier, project);
                                 populateSpecNodeWithFolderAndScreenshots(folder, screenshots, specNode, virtualFileToNodeAdder, imageType);
 
                                 //Adds the spec file that belongs to the spec node. This is necessary for the "Navigate to Usage" screenshot action.
@@ -186,51 +137,12 @@ private void collectSpecsAndScreenshots(@NotNull List<VirtualFile> filesAndFolde
             });
     }
 
-    private void populateSpecNodeWithFolderAndScreenshots(VirtualFile folder, @NotNull VirtualFile[] screenshots,
-                                                          TerraWdioTreeSpecNode specNode, VirtualFileToNodeAdder virtualFileToNodeAdder,
-                                                          @NotNull String imageType) {
-        //Save folder virtual files only when they belong to the reference version, and not to the latest or diff
-        if (TerraWdioFolders.REFERENCE.equals(imageType)) {
-            virtualFileToNodeAdder.accept(specNode, folder);
-        }
-        for (VirtualFile screenshot : screenshots) {
-            if (existsAfterRefresh(screenshot)) {
-                specNode.findScreenshotNodeByName(screenshot.getName())
-                    //If one or more screenshot node have already been added with a given name
-                    .ifPresentOrElse(s -> virtualFileToNodeAdder.accept(s, screenshot),
-                        //If a screenshot node hasn't been added
-                        () -> {
-                            TerraWdioTreeScreenshotNode newScreenshotNode = TerraWdioTreeNode.forScreenshot(screenshot.getName(), project);
-                            virtualFileToNodeAdder.accept(newScreenshotNode, screenshot);
-                            specNode.addScreenshot(newScreenshotNode);
-                            Disposer.register(specNode, newScreenshotNode);
-                        });
-            }
-        }
-    }
-
-    /**
-     * Refreshes the argument virtual file and returns whether it still exists or not.
-     */
-    public static boolean existsAfterRefresh(@Nullable VirtualFile virtualFile) {
-        if (virtualFile != null) {
-            virtualFile.refresh(false, virtualFile.isDirectory());
-            return virtualFile.exists();
-        }
-        return false;
-    }
-
     // The methods below are responsible for building the actual tree model from the backing model data.
 
-    @Override
-    public Object getRoot() {
-        return data;
-    }
-
     @Override
     public Object getChild(Object parent, int index) {
         TerraWdioTreeNode child = null;
-        if (parent instanceof TerraWdioTreeModelDataRoot) {
+        if (parent instanceof TreeModelDataRoot) {
             child = data.getSpecs().get(index);
         } else if (isSpec(parent)) {
             child = asSpec(parent).getScreenshot(index);
@@ -241,7 +153,7 @@ public Object getChild(Object parent, int index) {
     @Override
     public int getChildCount(Object parent) {
         int count = 0;
-        if (parent instanceof TerraWdioTreeModelDataRoot) {
+        if (parent instanceof TreeModelDataRoot) {
             count = data.getSpecs().size();
         } else if (isSpec(parent)) {
             count = asSpec(parent).screenshotCount();
@@ -252,7 +164,7 @@ public int getChildCount(Object parent) {
     @Override
     public boolean isLeaf(Object node) {
         boolean isLeaf = data.getSpecs().isEmpty();
-        if (!(node instanceof TerraWdioTreeModelDataRoot)) {
+        if (!(node instanceof TreeModelDataRoot)) {
             int index = data.getSpecs().indexOf(node);
             isLeaf = !isSpec(node) || (index != -1 && data.getSpecs().get(index).screenshotCount() == 0);
         }
@@ -263,7 +175,7 @@ public boolean isLeaf(Object node) {
     public int getIndexOfChild(Object parent, Object child) {
         int indexOfChild = 0;
         if (parent != null && child != null) {
-            if (parent instanceof TerraWdioTreeModelDataRoot) {
+            if (parent instanceof TreeModelDataRoot) {
                 indexOfChild = data.getSpecs().indexOf(child);
             } else if (isSpec(parent)) {
                 indexOfChild = asSpec(parent).getScreenshots().indexOf(child);
@@ -273,20 +185,4 @@ public int getIndexOfChild(Object parent, Object child) {
         }
         return indexOfChild;
     }
-
-    @Override
-    public void valueForPathChanged(TreePath path, Object newValue) {
-    }
-
-    @Override
-    public void addTreeModelListener(TreeModelListener l) {
-    }
-
-    @Override
-    public void removeTreeModelListener(TreeModelListener l) {
-    }
-
-    @FunctionalInterface
-    private interface VirtualFileToNodeAdder extends BiConsumer<AbstractTerraWdioTreeNode, VirtualFile> {
-    }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/ToggleStatisticsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/ToggleStatisticsAction.java
index 5b1eb97..8b42d5a 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/ToggleStatisticsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/ToggleStatisticsAction.java
@@ -3,6 +3,7 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
+import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 import com.picimako.terra.resources.TerraBundle;
@@ -27,7 +28,8 @@ public ToggleStatisticsAction(Runnable updateUICallback) {
 
     @Override
     public boolean isSelected(@NotNull AnActionEvent e) {
-        return ScreenshotStatisticsProjectService.getInstance(e.getProject()).isShowStatistics;
+        Project project = e.getProject();
+        return project != null && ScreenshotStatisticsProjectService.getInstance(project).isShowStatistics;
     }
 
     @Override
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/AbstractTerraWdioToolWindowAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/AbstractTerraWdioToolWindowAction.java
index c2ae31e..0ae34cf 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/AbstractTerraWdioToolWindowAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/AbstractTerraWdioToolWindowAction.java
@@ -24,7 +24,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * Provides easier implementation of, and a somewhat updated API for performing Terra wdio tool window actions.
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/CompareLatestWithReferenceScreenshotsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/CompareLatestWithReferenceScreenshotsAction.java
index b73e3fa..5c20570 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/CompareLatestWithReferenceScreenshotsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/CompareLatestWithReferenceScreenshotsAction.java
@@ -16,8 +16,8 @@
 
 package com.picimako.terra.wdio.toolwindow.action;
 
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 import java.util.List;
@@ -30,7 +30,7 @@
 
 import com.picimako.terra.resources.TerraBundle;
 import com.picimako.terra.wdio.imagepreview.ReferenceToLatestScreenshotsPreview;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * An action to open a special Terra screenshot view for comparing reference and latest screenshots, via the Terra wdio tool window.
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/DeleteScreenshotsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/DeleteScreenshotsAction.java
index d5dbc47..fbe467d 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/DeleteScreenshotsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/DeleteScreenshotsAction.java
@@ -17,8 +17,8 @@
 package com.picimako.terra.wdio.toolwindow.action;
 
 import static com.intellij.openapi.ui.Messages.YES;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -36,9 +36,9 @@
 
 import com.picimako.terra.resources.TerraBundle;
 import com.picimako.terra.settings.TerraApplicationState;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeScreenshotNode;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeSpecNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * An action to delete screenshot files via the Terra wdio tool window.
@@ -83,7 +83,7 @@ public DeleteScreenshotsAction(@NotNull Project project) {
     public void performAction(TerraWdioTree tree, @Nullable Project project) {
         if (tree != null && isScreenshot(tree.getLastSelectedPathComponent())) {
             if (isUserSureToDeleteTheScreenshots()) {
-                TerraWdioTreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
+                TreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
                 final List<String> erroredFilePaths = new ArrayList<>();
                 final List<VirtualFile> deletedScreenshotReferences = new ArrayList<>();
 
@@ -97,7 +97,7 @@ public void performAction(TerraWdioTree tree, @Nullable Project project) {
                 //Delete the screenshot node from the tree model, and update the UI,
                 //so that the changes are reflected in the tool window, otherwise show message dialog that deletion was not successful.
                 if (erroredFilePaths.isEmpty()) {
-                    TerraWdioTreeSpecNode parentSpec = tree.getParentSpecOfSelected();
+                    TreeSpecNode parentSpec = tree.getParentSpecOfSelected();
                     parentSpec.getScreenshots().remove(selectedScreenshotNode);
 
                     //If there is no screenshot node left under the parent spec node after the deletion, then remove the spec node as well. Fixes #19.
@@ -126,7 +126,7 @@ public void performAction(TerraWdioTree tree, @Nullable Project project) {
      * @param parentSpec the spec node to remove
      * @param tree       the tree to remove from
      */
-    private void removeSpecNode(TerraWdioTreeSpecNode parentSpec, TerraWdioTree tree) {
+    private void removeSpecNode(TreeSpecNode parentSpec, TerraWdioTree tree) {
         //Save the expansion state of nodes from before removing the spec node
         Enumeration<TreePath> expandedNodes = tree.getAllExpandedNodes();
         tree.getRoot().getSpecs().remove(parentSpec);
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageAction.java
index f59e3c4..a0e4531 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageAction.java
@@ -18,8 +18,9 @@
 
 import static com.picimako.terra.wdio.ProblemDialogs.showNoSpecFileToNavigateToDialog;
 import static com.picimako.terra.wdio.ProblemDialogs.showNoValidationCallToNavigateToDialog;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.TerraWdioFolders.existsAfterRefresh;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 
@@ -34,9 +35,8 @@
 
 import com.picimako.terra.resources.TerraBundle;
 import com.picimako.terra.wdio.ToScreenshotUsageNavigator;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeModel;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeSpecNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * An action to navigate to the usage of screenshots (within their corresponding wdio spec files) from the Terra
@@ -49,7 +49,7 @@
  */
 public class NavigateToScreenshotUsageAction extends AbstractTerraWdioToolWindowAction {
 
-    private final ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator();
+    private final ToScreenshotUsageNavigator navigator;
 
     /**
      * Creates a NavigateToScreenshotUsageAction instance.
@@ -60,6 +60,7 @@ public NavigateToScreenshotUsageAction(@NotNull Project project) {
         super(TerraBundle.toolWindow("screenshot.navigate.to.usage"), project);
         AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_GOTO_DECLARATION);
         setShortcutSet(action.getShortcutSet());
+        navigator = new ToScreenshotUsageNavigator(project);
     }
 
     /**
@@ -82,8 +83,8 @@ public NavigateToScreenshotUsageAction(@NotNull Project project) {
     @Override
     public void performAction(TerraWdioTree tree, @Nullable Project project) {
         if (tree != null && isScreenshot(tree.getLastSelectedPathComponent())) {
-            TerraWdioTreeSpecNode parentSpec = (TerraWdioTreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
-            if (TerraWdioTreeModel.existsAfterRefresh(parentSpec.getSpecFile())) {
+            TreeSpecNode parentSpec = (TreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
+            if (existsAfterRefresh(parentSpec.getSpecFile())) {
                 PsiFile specPsiFile = PsiManager.getInstance(project).findFile(parentSpec.getSpecFile());
                 String selectedScreenshotNodeName = asScreenshot(tree.getLastSelectedPathComponent()).getDisplayName();
 
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/RenameScreenshotsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/RenameScreenshotsAction.java
index 380cd6b..f1260ae 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/RenameScreenshotsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/RenameScreenshotsAction.java
@@ -16,12 +16,11 @@
 
 package com.picimako.terra.wdio.toolwindow.action;
 
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import com.intellij.openapi.actionSystem.CommonShortcuts;
@@ -31,14 +30,15 @@
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import com.picimako.terra.resources.TerraBundle;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeScreenshotNode;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeSpecNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * An action to rename screenshot files via the Terra wdio tool window.
@@ -88,7 +88,7 @@ public RenameScreenshotsAction(@NotNull Project project) {
     @Override
     public void performAction(TerraWdioTree tree, @Nullable Project project) {
         if (tree != null && isScreenshot(tree.getLastSelectedPathComponent())) {
-            TerraWdioTreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
+            TreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
             String originalFileName = selectedScreenshotNode.getDisplayName();
             String newFileName = askUserForNewFileName(originalFileName, originalFileName.substring(originalFileName.lastIndexOf(".") + 1));
 
@@ -96,9 +96,9 @@ public void performAction(TerraWdioTree tree, @Nullable Project project) {
                 List<VirtualFile> references = selectedScreenshotNode.getReferences();
 
                 if (references.stream().allMatch(VirtualFile::isWritable)) {
-                    final List<VirtualFile> successfullyRenamed = new ArrayList<>();
-                    final List<String> erroredFilePaths = new ArrayList<>();
-                    TerraWdioTreeSpecNode parentSpec = (TerraWdioTreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
+                    final List<VirtualFile> successfullyRenamed = new SmartList<>();
+                    final List<String> erroredFilePaths = new SmartList<>();
+                    TreeSpecNode parentSpec = (TreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
 
                     for (VirtualFile reference : references) {
                         if (reference.exists()) {
@@ -107,7 +107,7 @@ public void performAction(TerraWdioTree tree, @Nullable Project project) {
                                 WriteAction.run(() -> reference.rename(this, newFileName));
                                 //If not yet created, create a new Screenshot Node under the current parent Spec Node, with the new name
                                 if (!parentSpec.hasScreenshotNodeForName(newFileName)) {
-                                    TerraWdioTreeScreenshotNode newScreenshot = TerraWdioTreeNode.forScreenshot(newFileName, project);
+                                    TreeScreenshotNode newScreenshot = TerraWdioTreeNode.forScreenshot(newFileName, project);
                                     newScreenshot.addReference(reference);
                                     parentSpec.addScreenshot(newScreenshot);
                                 } else {
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/ReplaceReferenceWithLatestAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/ReplaceReferenceWithLatestAction.java
index 0e932b7..943d448 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/ReplaceReferenceWithLatestAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/ReplaceReferenceWithLatestAction.java
@@ -16,8 +16,8 @@
 
 package com.picimako.terra.wdio.toolwindow.action;
 
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 import java.io.IOException;
@@ -38,9 +38,9 @@
 
 import com.picimako.terra.resources.TerraBundle;
 import com.picimako.terra.wdio.TerraWdioFolders;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeScreenshotNode;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeSpecNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * An action to replace reference screenshot files with latest screenshots via the Terra wdio tool window.
@@ -78,7 +78,7 @@ public ReplaceReferenceWithLatestAction(@NotNull Project project) {
     @Override
     public void performAction(TerraWdioTree tree, @Nullable Project project) {
         if (tree != null && isScreenshot(tree.getLastSelectedPathComponent())) {
-            TerraWdioTreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
+            TreeScreenshotNode selectedScreenshotNode = asScreenshot(tree.getLastSelectedPathComponent());
 
             final List<String> erroredFilePaths = new ArrayList<>();
             final Set<VirtualFile> referencesToRemove = new HashSet<>();
@@ -114,7 +114,7 @@ public void performAction(TerraWdioTree tree, @Nullable Project project) {
             });
 
             if (erroredFilePaths.isEmpty()) {
-                TerraWdioTreeSpecNode parentSpec = (TerraWdioTreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
+                TreeSpecNode parentSpec = (TreeSpecNode) tree.getSelectionPath().getParentPath().getLastPathComponent();
                 parentSpec.reorderScreenshotsAlphabeticallyByDisplayName();
                 tree.updateUI();
             } else {
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/ShowDiffScreenshotsAction.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/ShowDiffScreenshotsAction.java
index 47c4d83..92b3aa0 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/ShowDiffScreenshotsAction.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/ShowDiffScreenshotsAction.java
@@ -16,8 +16,8 @@
 
 package com.picimako.terra.wdio.toolwindow.action;
 
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.asScreenshot;
-import static com.picimako.terra.wdio.toolwindow.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
 
 import java.awt.event.KeyEvent;
 
@@ -30,7 +30,7 @@
 
 import com.picimako.terra.resources.TerraBundle;
 import com.picimako.terra.wdio.imagepreview.DiffScreenshotsPreview;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * An action to open a special Terra screenshot view for displaying diff screenshots, via the Terra wdio tool window.
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioDataRetrieverUtil.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioDataRetrieverUtil.java
index 089a54a..336ce10 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioDataRetrieverUtil.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioDataRetrieverUtil.java
@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * Utility class for simplifying the retrieval of Terra wdio related data.
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioScreenshotActionsGroup.java b/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioScreenshotActionsGroup.java
index 5a6a37e..c0fef15 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioScreenshotActionsGroup.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/action/TerraWdioScreenshotActionsGroup.java
@@ -41,7 +41,7 @@ public void update(@NotNull AnActionEvent e) {
     }
 
     @Override
-    public @NotNull AnAction[] getChildren(@Nullable AnActionEvent e) {
+    public AnAction @NotNull [] getChildren(@Nullable AnActionEvent e) {
         Project project = e.getData(PlatformDataKeys.PROJECT);
         if (project != null) {
             return new AnAction[]{
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/event/MouseListeningScreenshotNodeActionInvoker.java b/src/main/java/com/picimako/terra/wdio/toolwindow/event/MouseListeningScreenshotNodeActionInvoker.java
index 527fb46..a7b57a8 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/event/MouseListeningScreenshotNodeActionInvoker.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/event/MouseListeningScreenshotNodeActionInvoker.java
@@ -22,7 +22,7 @@
 
 import com.intellij.openapi.project.Project;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 import com.picimako.terra.wdio.toolwindow.action.CompareLatestWithReferenceScreenshotsAction;
 
 /**
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/event/ShortcutKeyListeningScreenshotNodeActionInvoker.java b/src/main/java/com/picimako/terra/wdio/toolwindow/event/ShortcutKeyListeningScreenshotNodeActionInvoker.java
index 8d52507..cfc187f 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/event/ShortcutKeyListeningScreenshotNodeActionInvoker.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/event/ShortcutKeyListeningScreenshotNodeActionInvoker.java
@@ -25,7 +25,7 @@
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 import com.picimako.terra.wdio.toolwindow.action.AbstractTerraWdioToolWindowAction;
 import com.picimako.terra.wdio.toolwindow.action.CompareLatestWithReferenceScreenshotsAction;
 import com.picimako.terra.wdio.toolwindow.action.DeleteScreenshotsAction;
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/event/ToolWindowPopupMenuInvoker.java b/src/main/java/com/picimako/terra/wdio/toolwindow/event/ToolWindowPopupMenuInvoker.java
index 73f1e94..14d9985 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/event/ToolWindowPopupMenuInvoker.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/event/ToolWindowPopupMenuInvoker.java
@@ -24,7 +24,7 @@
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import org.jetbrains.annotations.NotNull;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * This class takes in the {@link TerraWdioTree} instance and a set of {@link ActionPopupMenu}s identified by their node
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/event/TreeNodeTypeIdentifier.java b/src/main/java/com/picimako/terra/wdio/toolwindow/event/TreeNodeTypeIdentifier.java
index 95d60d5..464e1ff 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/event/TreeNodeTypeIdentifier.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/event/TreeNodeTypeIdentifier.java
@@ -18,8 +18,8 @@
 
 import javax.swing.tree.TreePath;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
 
 /**
  * Utility class to retrieve the node type selected in the Terra wdio tool window.
@@ -44,7 +44,7 @@ static String identifyTreeNodeTypeForClickLocation(TerraWdioTree tree, int x, in
                 tree.setSelectionRow(selectionRow);
             }
             //Indicates that this particular action popup should be displayed only for a screenshot or a spec node in the tree
-            if (path.getLastPathComponent() instanceof TerraWdioTreeScreenshotNode) {
+            if (path.getLastPathComponent() instanceof TreeScreenshotNode) {
                 itemToSelect = "Screenshot";
 //              } else if (path.getLastPathComponent() instanceof TerraWdioTreeSpecNode) {
 //                  itemToSelect = "Spec";
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeNode.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/AbstractTerraWdioTreeNode.java
similarity index 72%
rename from src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeNode.java
rename to src/main/java/com/picimako/terra/wdio/toolwindow/node/AbstractTerraWdioTreeNode.java
index a9f6157..7662435 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/AbstractTerraWdioTreeNode.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/AbstractTerraWdioTreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.toolwindow;
+package com.picimako.terra.wdio.toolwindow.node;
 
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -37,13 +39,16 @@
  */
 public abstract class AbstractTerraWdioTreeNode implements TerraWdioTreeNode {
 
-    protected final List<VirtualFile> references = new ArrayList<>();
+    protected final List<VirtualFile> references = new SmartList<>();
     protected final String displayName;
+    protected final Project project;
 
-    public AbstractTerraWdioTreeNode(@NotNull String displayName) {
+    public AbstractTerraWdioTreeNode(@NotNull String displayName, Project project) {
         this.displayName = displayName;
+        this.project = project;
     }
 
+    @Override
     public String getDisplayName() {
         return displayName;
     }
@@ -61,6 +66,19 @@ public List<VirtualFile> getReferences() {
         return references;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AbstractTerraWdioTreeNode that = (AbstractTerraWdioTreeNode) o;
+        return Objects.equals(displayName, that.displayName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(displayName);
+    }
+
     @Override
     public void dispose() {
         references.clear();
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTree.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTree.java
new file mode 100644
index 0000000..25efbc7
--- /dev/null
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTree.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.toolwindow.node;
+
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.asSpec;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isScreenshot;
+import static com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode.isSpec;
+
+import java.awt.*;
+import java.util.Enumeration;
+import javax.swing.*;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+import javax.swing.tree.TreeSelectionModel;
+
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.util.treeView.NodeRenderer;
+import com.intellij.util.PlatformIcons;
+import icons.ImagesIcons;
+import org.jetbrains.annotations.NotNull;
+
+import com.picimako.terra.wdio.toolwindow.TerraWdioTreeModel;
+
+/**
+ * A custom Swing component for rendering a tree view for the Terra wdio components.
+ * <p>
+ * It uses the {@link TerraWdioNodeRenderer} to customize the appearance of the tree nodes.
+ *
+ * @see TerraWdioTreeModel
+ */
+public class TerraWdioTree extends JTree {
+
+    /**
+     * Creates a tree component.
+     *
+     * @param model the underlying model containing the nodes of the tree
+     */
+    public TerraWdioTree(TreeModel model) {
+        super(model);
+        setCellRenderer(new TerraWdioNodeRenderer());
+        getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+        setExpandsSelectedPaths(true);
+    }
+
+    /**
+     * Gets the parent node of the currently selected node as spec.
+     * <p>
+     * Call this only when you are sure that the currently selected node is a screenshot node.
+     *
+     * @return the parent spec node
+     */
+    public TreeSpecNode getParentSpecOfSelected() {
+        return asSpec(getSelectionPath().getParentPath().getLastPathComponent());
+    }
+
+    /**
+     * Gets the root node of this tree.
+     *
+     * @return the root node
+     */
+    public TreeModelDataRoot getRoot() {
+        return (TreeModelDataRoot) getModel().getRoot();
+    }
+
+    /**
+     * Gets all expanded nodes of this tree, the expanded descendants of the root node.
+     *
+     * @return the expanded nodes
+     */
+    public Enumeration<TreePath> getAllExpandedNodes() {
+        return getExpandedDescendants(new TreePath(getRoot()));
+    }
+
+    /**
+     * Restores the expansion state of nodes to a previous state (the argument expanded nodes).
+     *
+     * @param expandedNodes the previous state of nodes
+     */
+    public void restoreExpansionStateFrom(Enumeration<TreePath> expandedNodes) {
+        while (expandedNodes.hasMoreElements()) {
+            expandPath(expandedNodes.nextElement());
+        }
+    }
+
+    /**
+     * Tree cell rendered that configures each entry in the tree with an icon (at the left) and the name of the node (at the right).
+     * <p>
+     * The root node and specs are configured with a folder icon, while screenshots are customized with an image file icon.
+     */
+    public static final class TerraWdioNodeRenderer extends NodeRenderer {
+
+        /**
+         * {@inheritDoc}
+         *
+         * <b>Terra wdio tool window cell rendering</b>
+         * <p>
+         * Screenshot nodes are marked with bold text in case they have at least one diff image.
+         * <p>
+         * Spec nodes are also marked with bold text if one of their underlying screenshots has at least one diff image.
+         */
+        @Override
+        public void customizeCellRenderer(@NotNull JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
+            super.customizeCellRenderer(tree, value, selected, expanded, leaf, row, hasFocus);
+
+            if (value instanceof TreeModelDataRoot) {
+                setIcon(PlatformIcons.FOLDER_ICON);
+                setFont(getFont().deriveFont(Font.PLAIN));
+            } else if (isSpec(value)) {
+                potentiallyMarkAsDiff(asSpec(value).getScreenshots().stream().anyMatch(TreeScreenshotNode::hasDiff));
+                markAsUnusedOrDefault(asSpec(value).getScreenshots().stream().anyMatch(TreeScreenshotNode::isUnused), PlatformIcons.FOLDER_ICON);
+            } else if (isScreenshot(value)) {
+                potentiallyMarkAsDiff(asScreenshot(value).hasDiff());
+                markAsUnusedOrDefault(asScreenshot(value).isUnused(), ImagesIcons.ImagesFileType);
+            }
+        }
+
+        private void potentiallyMarkAsDiff(boolean hasDiff) {
+            setFont(getFont().deriveFont(hasDiff ? Font.BOLD : Font.PLAIN));
+        }
+
+        private void markAsUnusedOrDefault(boolean isOrHasUnused, Icon defaultIcon) {
+            setIcon(isOrHasUnused ? AllIcons.RunConfigurations.TestError : defaultIcon);
+        }
+    }
+}
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNode.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTreeNode.java
similarity index 69%
rename from src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNode.java
rename to src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTreeNode.java
index 5f51a9f..1fe79ec 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNode.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TerraWdioTreeNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.toolwindow;
+package com.picimako.terra.wdio.toolwindow.node;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
@@ -23,9 +23,9 @@
 /**
  * Represents a node in the {@link TerraWdioTree} which then is visualized within the Terra wdio tool window as a tree.
  *
- * @see TerraWdioTreeModelDataRoot
- * @see TerraWdioTreeSpecNode
- * @see TerraWdioTreeScreenshotNode
+ * @see TreeModelDataRoot
+ * @see TreeSpecNode
+ * @see TreeScreenshotNode
  */
 public interface TerraWdioTreeNode extends Disposable {
 
@@ -42,8 +42,8 @@ public interface TerraWdioTreeNode extends Disposable {
      * @param displayName the displayName of the spec file
      * @return the new node
      */
-    static TerraWdioTreeSpecNode forSpec(@NotNull String displayName, Project project) {
-        return new TerraWdioTreeSpecNode(displayName, project);
+    static TreeSpecNode forSpec(@NotNull String displayName, Project project) {
+        return new TreeSpecNode(displayName, project);
     }
 
     /**
@@ -52,8 +52,8 @@ static TerraWdioTreeSpecNode forSpec(@NotNull String displayName, Project projec
      * @param displayName the displayName of the screenshot (without the extension)
      * @return the new node
      */
-    static TerraWdioTreeScreenshotNode forScreenshot(@NotNull String displayName, Project project) {
-        return new TerraWdioTreeScreenshotNode(displayName, project);
+    static TreeScreenshotNode forScreenshot(@NotNull String displayName, Project project) {
+        return new TreeScreenshotNode(displayName, project);
     }
 
     /**
@@ -63,17 +63,17 @@ static TerraWdioTreeScreenshotNode forScreenshot(@NotNull String displayName, Pr
      * @return true if the node is a spec, otherwise false
      */
     static boolean isSpec(Object node) {
-        return node instanceof TerraWdioTreeSpecNode;
+        return node instanceof TreeSpecNode;
     }
 
     /**
-     * Returns the argument object as a {@link TerraWdioTreeSpecNode}.
+     * Returns the argument object as a {@link TreeSpecNode}.
      *
      * @param node the object to cast
      * @return the casted object
      */
-    static TerraWdioTreeSpecNode asSpec(Object node) {
-        return (TerraWdioTreeSpecNode) node;
+    static TreeSpecNode asSpec(Object node) {
+        return (TreeSpecNode) node;
     }
 
     /**
@@ -83,16 +83,16 @@ static TerraWdioTreeSpecNode asSpec(Object node) {
      * @return true if the node is a screenshot, otherwise false
      */
     static boolean isScreenshot(Object node) {
-        return node instanceof TerraWdioTreeScreenshotNode;
+        return node instanceof TreeScreenshotNode;
     }
 
     /**
-     * Returns the argument object as a {@link TerraWdioTreeScreenshotNode}.
+     * Returns the argument object as a {@link TreeScreenshotNode}.
      *
      * @param node the object to cast
      * @return the casted object
      */
-    static TerraWdioTreeScreenshotNode asScreenshot(Object node) {
-        return (TerraWdioTreeScreenshotNode) node;
+    static TreeScreenshotNode asScreenshot(Object node) {
+        return (TreeScreenshotNode) node;
     }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRoot.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeModelDataRoot.java
similarity index 68%
rename from src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRoot.java
rename to src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeModelDataRoot.java
index c594484..76e3c80 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRoot.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeModelDataRoot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.toolwindow;
+package com.picimako.terra.wdio.toolwindow.node;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.toolwindow.ScreenshotStatisticsProjectService;
+
 /**
  * Each node in the tree is identified by its name: in case of spec nodes, by the spec file's name without the file extension,
  * in case of screenshots, by the screenshot's whole name, including the extension.
@@ -33,20 +36,15 @@
  * This node also displays the basic statistics about the overall, distinct number of specs and screenshot files in the project.
  * Both the spec and screenshot values handle singular and plural cases based on the count values.
  */
-public class TerraWdioTreeModelDataRoot extends AbstractTerraWdioTreeNode {
+public class TreeModelDataRoot extends AbstractTerraWdioTreeNode {
 
-    private static final String SPEC = "spec";
-    private static final String SCREENSHOT = "screenshot";
-    private static final String STAT_FORMAT = " (%s, %s)";
-    private final List<TerraWdioTreeSpecNode> specs = new ArrayList<>();
-    private final Project project;
+    private final List<TreeSpecNode> specs = new SmartList<>();
 
-    public TerraWdioTreeModelDataRoot(@NotNull String displayName, Project project) {
-        super(displayName);
-        this.project = project;
+    public TreeModelDataRoot(@NotNull String displayName, Project project) {
+        super(displayName, project);
     }
 
-    public List<TerraWdioTreeSpecNode> getSpecs() {
+    public List<TreeSpecNode> getSpecs() {
         return specs;
     }
 
@@ -54,7 +52,7 @@ public List<TerraWdioTreeSpecNode> getSpecs() {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        TerraWdioTreeModelDataRoot that = (TerraWdioTreeModelDataRoot) o;
+        TreeModelDataRoot that = (TreeModelDataRoot) o;
         return Objects.equals(specs, that.specs);
     }
 
@@ -66,23 +64,21 @@ public int hashCode() {
     @Override
     public String toString() {
         return ScreenshotStatisticsProjectService.getInstance(project).isShowStatistics
-            ? displayName + String.format(STAT_FORMAT, pluralize(SPEC, specs.size()), pluralize(SCREENSHOT, screenshotCount()))
+            ? TerraBundle.toolWindow("root.node.name.with.stat", specs.size(), screenshotCount())
             : displayName;
     }
 
     private int screenshotCount() {
         return specs.stream()
             .flatMap(spec -> spec.getScreenshots().stream())
-            .mapToInt(screenshot -> screenshot.getReferences().size()).sum();
-    }
-
-    private String pluralize(String string, int count) {
-        return count + " " + (count != 1 ? string + "s" : string);
+            .mapToInt(screenshot -> screenshot.getReferences().size())
+            .sum();
     }
 
     @Override
     public void dispose() {
         super.dispose();
+        specs.forEach(TreeSpecNode::dispose);
         specs.clear();
     }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNode.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeScreenshotNode.java
similarity index 80%
rename from src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNode.java
rename to src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeScreenshotNode.java
index 5abe864..adb94aa 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNode.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeScreenshotNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,28 +14,28 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.toolwindow;
+package com.picimako.terra.wdio.toolwindow.node;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
+import com.picimako.terra.wdio.toolwindow.ScreenshotStatisticsProjectService;
+
 /**
  * Represents a screenshot node in the tree displayed in the Terra wido tool window.
  */
-public class TerraWdioTreeScreenshotNode extends AbstractTerraWdioTreeNode {
+public class TreeScreenshotNode extends AbstractTerraWdioTreeNode {
 
-    private final Project project;
-    protected final List<VirtualFile> diffs = new ArrayList<>();
-    protected final List<VirtualFile> latests = new ArrayList<>();
+    protected final List<VirtualFile> diffs = new SmartList<>();
+    protected final List<VirtualFile> latests = new SmartList<>();
     protected boolean unused = false;
 
-    public TerraWdioTreeScreenshotNode(@NotNull String displayName, Project project) {
-        super(displayName);
-        this.project = project;
+    public TreeScreenshotNode(@NotNull String displayName, Project project) {
+        super(displayName, project);
     }
 
     public void addDiff(VirtualFile virtualFile) {
diff --git a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNode.java b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeSpecNode.java
similarity index 76%
rename from src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNode.java
rename to src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeSpecNode.java
index 0edcafe..7e06b7e 100644
--- a/src/main/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNode.java
+++ b/src/main/java/com/picimako/terra/wdio/toolwindow/node/TreeSpecNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.wdio.toolwindow;
+package com.picimako.terra.wdio.toolwindow.node;
 
 import static java.util.Comparator.comparing;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.picimako.terra.wdio.toolwindow.ScreenshotStatisticsProjectService;
+
 /**
  * Represents a spec file/folder in the tree displayed in the Terra wdio tool window.
  * <p>
@@ -36,15 +37,13 @@
  * The number of underlying screenshots may be zero, because there might be cases when all tests within the corresponding
  * spec file are implemented without taking any screenshots.
  */
-public class TerraWdioTreeSpecNode extends AbstractTerraWdioTreeNode {
+public class TreeSpecNode extends AbstractTerraWdioTreeNode {
 
-    private final List<TerraWdioTreeScreenshotNode> screenshots = new ArrayList<>();
-    private final Project project;
+    private final List<TreeScreenshotNode> screenshots = new SmartList<>();
     private VirtualFile specFile;
 
-    public TerraWdioTreeSpecNode(@NotNull String displayName, Project project) {
-        super(displayName);
-        this.project = project;
+    public TreeSpecNode(@NotNull String displayName, Project project) {
+        super(displayName, project);
     }
 
     /**
@@ -52,7 +51,7 @@ public TerraWdioTreeSpecNode(@NotNull String displayName, Project project) {
      *
      * @param screenshot the node to add
      */
-    public void addScreenshot(@NotNull TerraWdioTreeScreenshotNode screenshot) {
+    public void addScreenshot(@NotNull TreeScreenshotNode screenshot) {
         this.screenshots.add(screenshot);
     }
 
@@ -61,7 +60,7 @@ public void addScreenshot(@NotNull TerraWdioTreeScreenshotNode screenshot) {
      *
      * @return the underlying screenshot nodes
      */
-    public List<TerraWdioTreeScreenshotNode> getScreenshots() {
+    public List<TreeScreenshotNode> getScreenshots() {
         return screenshots;
     }
 
@@ -71,7 +70,7 @@ public List<TerraWdioTreeScreenshotNode> getScreenshots() {
      * @param index the 0-based index
      * @return the nth screenshot node
      */
-    public TerraWdioTreeScreenshotNode getScreenshot(int index) {
+    public TreeScreenshotNode getScreenshot(int index) {
         return screenshots.get(index);
     }
 
@@ -92,7 +91,7 @@ public void setSpecFile(VirtualFile specFile) {
      * @param name the name to search by, never null
      * @return the node wrapped in Optional, otherwise empty Optional
      */
-    public Optional<TerraWdioTreeScreenshotNode> findScreenshotNodeByName(@NotNull String name) {
+    public Optional<TreeScreenshotNode> findScreenshotNodeByName(@NotNull String name) {
         return screenshots.stream()
             .filter(node -> name.equals(node.getDisplayName()))
             .findFirst();
@@ -124,19 +123,6 @@ public void reorderScreenshotsAlphabeticallyByDisplayName() {
         screenshots.sort(comparing(AbstractTerraWdioTreeNode::getDisplayName));
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        TerraWdioTreeSpecNode that = (TerraWdioTreeSpecNode) o;
-        return Objects.equals(displayName, that.displayName);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(displayName);
-    }
-
     @Override
     public String toString() {
         return ScreenshotStatisticsProjectService.getInstance(project).isShowStatistics
@@ -147,6 +133,7 @@ public String toString() {
     @Override
     public void dispose() {
         super.dispose();
+        screenshots.forEach(TreeScreenshotNode::dispose);
         screenshots.clear();
     }
 }
diff --git a/src/main/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspection.java b/src/main/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspection.java
index f01b322..dea341e 100644
--- a/src/main/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspection.java
@@ -16,7 +16,8 @@
 
 package com.picimako.terra.wdio.viewports.inspection;
 
-import static com.picimako.terra.wdio.TerraWdioPsiUtil.WDIO_SPEC_FILE_NAME_PATTERN;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getMethodExpressionOf;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getViewportsSet;
 
@@ -25,6 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpression;
@@ -57,23 +59,25 @@ public class DuplicateDescribeViewportsBlockInspection extends TerraWdioInspecti
     }
 
     @Override
-    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSFile(JSFile file) {
                 super.visitJSFile(file);
 
-                if (file.getName().matches(WDIO_SPEC_FILE_NAME_PATTERN)) {
-                    PsiElement[] describeViewportsBlocks = PsiTreeUtil.collectElements(file, e -> e instanceof JSExpressionStatement && isTopLevelTerraDescribeViewportsBlock(e));
-                    //In case of 1 or zero describeViewports blocks, there is no validation needed
-                    if (describeViewportsBlocks.length == 2) {
-                        if (getViewportsSet(describeViewportsBlocks[0]).equals(getViewportsSet(describeViewportsBlocks[1]))) {
-                            registerProblem(describeViewportsBlocks[0], holder);
-                            registerProblem(describeViewportsBlocks[1], holder);
-                        }
-                    } else if (describeViewportsBlocks.length > 2) {
-                        reportDuplicateBlocks(describeViewportsBlocks, holder);
+                PsiElement[] describeViewportsBlocks = PsiTreeUtil.collectElements(file, e -> e instanceof JSExpressionStatement && isTopLevelTerraDescribeViewportsBlock(e));
+                //In case of 1 or zero describeViewports blocks, there is no validation needed
+                if (describeViewportsBlocks.length == 2) {
+                    if (getViewportsSet(describeViewportsBlocks[0]).equals(getViewportsSet(describeViewportsBlocks[1]))) {
+                        registerProblem(describeViewportsBlocks[0], holder);
+                        registerProblem(describeViewportsBlocks[1], holder);
                     }
+                } else if (describeViewportsBlocks.length > 2) {
+                    reportDuplicateBlocks(describeViewportsBlocks, holder);
                 }
             }
         };
diff --git a/src/main/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspection.java b/src/main/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspection.java
index 5b1d5c5..1eaff2d 100644
--- a/src/main/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspection.java
@@ -16,9 +16,11 @@
 
 package com.picimako.terra.wdio.viewports.inspection;
 
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.getMethodExpressionOf;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.lang.javascript.psi.JSElementVisitor;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
@@ -41,14 +43,18 @@ public class NestedTerraDescribeViewportsBlocksNotAllowedInspection extends Terr
     }
 
     @Override
-    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @SuppressWarnings("ConstantConditions")
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isNestedTerraDescribeViewportsBlock(node)) {
+                if (isNestedTerraDescribeViewportsBlock(node)) {
                     //At this point getMethodExpressionOf() should not return null because it has been validated in isNestedTerraDescribeViewportsBlock().
                     holder.registerProblem(getMethodExpressionOf(node), TerraBundle.inspection("nested.viewports.blocks.not.allowed"));
                 }
diff --git a/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsBlockingInspection.java b/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsBlockingInspection.java
index a191660..b555d72 100644
--- a/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsBlockingInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsBlockingInspection.java
@@ -17,8 +17,9 @@
 package com.picimako.terra.wdio.viewports.inspection;
 
 import static com.intellij.lang.javascript.psi.JSVarStatement.VarKeyword.CONST;
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
 import static com.picimako.terra.psi.js.JSLiteralExpressionUtil.getStringValue;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.isSupportedViewport;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
@@ -26,6 +27,7 @@
 import javax.swing.*;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
@@ -75,20 +77,21 @@ public String getShortName() {
     public JComponent createOptionsPanel() {
         final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this);
         panel.addCheckbox("Report empty viewports array", "reportEmptyViewports");
-//        panel.addCheckbox("Report not supported viewport values", "reportNotSupportedViewports");
-//        panel.addCheckbox("Report non-array-type viewports", "reportNonArrayViewports");
         return panel;
     }
 
     @Override
-    @NotNull
-    public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTopLevelTerraDescribeViewportsBlock(node)) {
+                if (isTopLevelTerraDescribeViewportsBlock(node)) {
                     JSArgumentUtil.doWithinArgumentListOf(node, argumentList -> {
                         if (argumentList.getArguments().length > 1) {
                             JSExpression viewportList = argumentList.getArguments()[1];
diff --git a/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsInspection.java b/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsInspection.java
index 5cf148f..4b3eb9e 100644
--- a/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsInspection.java
+++ b/src/main/java/com/picimako/terra/wdio/viewports/inspection/TerraDescribeViewportsInspection.java
@@ -17,8 +17,9 @@
 package com.picimako.terra.wdio.viewports.inspection;
 
 import static com.intellij.lang.javascript.buildTools.JSPsiUtil.getCallExpression;
-import static com.picimako.terra.FileTypePreconditions.isInWdioSpecFile;
+import static com.picimako.terra.FileTypePreconditions.isWdioSpecFile;
 import static com.picimako.terra.psi.js.JSLiteralExpressionUtil.getStringValue;
+import static com.picimako.terra.wdio.TerraResourceManager.isUsingTerra;
 import static com.picimako.terra.wdio.TerraWdioPsiUtil.isSupportedViewport;
 import static java.util.Comparator.reverseOrder;
 import static java.util.stream.Collectors.toList;
@@ -30,6 +31,7 @@
 import java.util.Set;
 import javax.swing.*;
 
+import com.intellij.codeInspection.LocalInspectionToolSession;
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
@@ -78,14 +80,17 @@ public JComponent createOptionsPanel() {
     }
 
     @Override
-    @NotNull
-    public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
+    public @NotNull PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly, @NotNull LocalInspectionToolSession session) {
+        if (!isUsingTerra(holder.getProject()) || !isWdioSpecFile(session.getFile())) {
+            return PsiElementVisitor.EMPTY_VISITOR;
+        }
+
         return new JSElementVisitor() {
             @Override
             public void visitJSExpressionStatement(JSExpressionStatement node) {
                 super.visitJSExpressionStatement(node);
 
-                if (isInWdioSpecFile(node) && isTopLevelTerraDescribeViewportsBlock(node)) {
+                if (isTopLevelTerraDescribeViewportsBlock(node)) {
                     JSCallExpression terraDescribeViewports = getCallExpression(node);
                     if (terraDescribeViewports != null) {
                         JSArgumentList argumentList = terraDescribeViewports.getArgumentList();
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index a4216af..1ff46b3 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -2,9 +2,10 @@
 <idea-plugin require-restart="true">
     <name>Terra Support</name>
     <id>terra.support</id>
-    <version>0.5.1</version>
+    <version>0.6.0-SNAPSHOT</version>
     <vendor url="https://github.com/picimako/terra-support">Tamas Balog</vendor>
     <resource-bundle>messages.TerraBundle</resource-bundle>
+    <resource-bundle>messages.TerraQuickDocBundle</resource-bundle>
 
     <!-- https://jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html -->
     <idea-version since-build="202"/>
@@ -58,6 +59,24 @@
                          displayName="Screenshot selector matches global selector"
                          groupPath="Terra,wdio" groupName="Screenshots" enabledByDefault="true" level="WARNING"
                          implementationClass="com.picimako.terra.wdio.screenshot.inspection.GlobalTerraSelectorInspection"/>
+        <localInspection id="invalidTerraValidationProperties" language="JavaScript"
+                         displayName="Invalid validation properties"
+                         groupPath="Terra,wdio" groupName="Screenshots" enabledByDefault="true" level="ERROR"
+                         implementationClass="com.picimako.terra.wdio.screenshot.inspection.InvalidTerraValidationPropertiesInspection"/>
+        <localInspection id="MissingScreenshotName" language="JavaScript"
+                         displayName="Missing screenshot name (terra-functional-testing)"
+                         groupPath="Terra,wdio" groupName="Screenshots" enabledByDefault="true" level="ERROR"
+                         implementationClass="com.picimako.terra.wdio.screenshot.inspection.MissingScreenshotNameInspection"/>
+        <localInspection id="duplicateScreenshotName" language="JavaScript"
+                         displayName="Duplicate screenshot name (terra-functional-testing)"
+                         groupPath="Terra,wdio" groupName="Screenshots" enabledByDefault="true" level="ERROR"
+                         implementationClass="com.picimako.terra.wdio.screenshot.inspection.DuplicateScreenshotNameInspection"/>
+
+        <!-- Terra helpers -->
+        <localInspection id="replaceTerraItWithTerraValidates" language="JavaScript"
+                         displayName="Terra.validates is preferred over Terra.it"
+                         groupPath="Terra,wdio" groupName="Helpers" enabledByDefault="true" level="WARNING"
+                         implementationClass="com.picimako.terra.wdio.inspection.ReplaceTerraItWithTerraValidatesInspection"/>
 
         <!-- Terra wdio tool window -->
         <toolWindow id="Terra wdio" anchor="left" icon="/com/picimako/terra/wdio/toolwindow/terrasupport.svg"
@@ -99,7 +118,6 @@
 
         <!-- Services -->
         <!-- Application service (registered via @Service annotation): com.picimako.terra.documentation.TerraUIComponentDocumentationUrlService -->
-        <!-- Application service (registered via @Service annotation): com.picimako.terra.documentation.TerraWdioDocumentationService -->
 
     </extensions>
 
diff --git a/src/main/resources/com/picimako/terra/documentation/terra-wdio-docs.properties b/src/main/resources/com/picimako/terra/documentation/terra-wdio-docs.properties
deleted file mode 100644
index 63be900..0000000
--- a/src/main/resources/com/picimako/terra/documentation/terra-wdio-docs.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-Terra={terra}|{wdioutil}
-Terra.it={terra}|{wdioutil}
-Terra.validates={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers
-Terra.it.matchesScreenshot={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers
-Terra.it.validatesElement={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-Terra.it.isAccessible={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-Terra.validates.screenshot={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers
-Terra.validates.element={terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-Terra.validates.accessibility={terra}|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
-Terra.hideInputCaret={terra} / Test Setup Helpers|{wdioutil}#test-setup-helpers
-Terra.viewports={terra} / Test Setup Helpers|{wdioutil}#test-setup-helpers
-Terra.describeViewports={terra} / Test Setup Helpers|{wdioutil}#test-setup-helpers
diff --git a/src/main/resources/inspectionDescriptions/DuplicateScreenshotName.html b/src/main/resources/inspectionDescriptions/DuplicateScreenshotName.html
new file mode 100644
index 0000000..f90c3cc
--- /dev/null
+++ b/src/main/resources/inspectionDescriptions/DuplicateScreenshotName.html
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright 2021 Tamás Balog
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<html>
+<body>
+<!-- tooltip end -->
+<p>This inspection reports cases when there is more than one validation referencing the same screenshot name.</p>
+<p>In terra-functional-testing that is not allowed, and the test execution <i>"will throw a mismatch error because two
+    screenshots are being generated with the same name"</i>.</p>
+<p>See the <a
+        href="https://engineering.cerner.com/terra-ui/dev_tools/cerner-terra-toolkit-docs/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#upgrading-tests">Terra
+    Upgrade Guide</a> for details.</p>
+<p>This is executed only when the project uses terra-functional-testing, not the legacy terra-toolkit.</p>
+</body>
+</html>
diff --git a/src/main/resources/inspectionDescriptions/InvalidTerraValidationProperties.html b/src/main/resources/inspectionDescriptions/InvalidTerraValidationProperties.html
new file mode 100644
index 0000000..2fbf264
--- /dev/null
+++ b/src/main/resources/inspectionDescriptions/InvalidTerraValidationProperties.html
@@ -0,0 +1,57 @@
+<!--
+  ~ Copyright 2021 Tamás Balog
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<html>
+<head>
+    <style>
+        table, th, td {
+            border: 1px solid black;
+            border-collapse: collapse;
+        }
+    </style>
+</head>
+<body>
+<!-- tooltip end -->
+<p>This inspection reports JS properties of <code>Terra.it</code> and <code>Terra.validates</code> helpers,
+    that are not applicable to the particular helpers.
+<p>
+    It handles both terra-toolkit and terra-functional-testing specific properties based on which library is
+    used in the project.
+<p>
+<table style="width:100%;">
+    <tr>
+        <th></th>
+        <th>terra-toolkit</th>
+        <th>terra-functional-testing</th>
+    </tr>
+    <tr>
+        <td>Terra.it.matchesScreenshot/validates.screenshot</td>
+        <td>misMatchTolerance, selector, viewports</td>
+        <td>mismatchTolerance, selector</td>
+    </tr>
+    <tr>
+        <td>Terra.it.validatesElement/validates.element</td>
+        <td>misMatchTolerance, selector, axeRules</td>
+        <td>mismatchTolerance, selector, rules</td>
+    </tr>
+    <tr>
+        <td>Terra.it.isAccessible/validates.accessibility</td>
+        <td>axeRules</td>
+        <td>rules</td>
+    </tr>
+</table>
+</body>
+</html>
diff --git a/src/main/resources/inspectionDescriptions/MissingScreenshotName.html b/src/main/resources/inspectionDescriptions/MissingScreenshotName.html
new file mode 100644
index 0000000..1b6176d
--- /dev/null
+++ b/src/main/resources/inspectionDescriptions/MissingScreenshotName.html
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright 2021 Tamás Balog
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<html>
+<body>
+<!-- tooltip end -->
+<p>This inspection reports cases when the screenshot name of Terra.validates calls are missing. That parameter
+    is mandatory in terra-functional-testing.</p>
+<p>See the <a
+        href="https://engineering.cerner.com/terra-ui/dev_tools/cerner-terra-toolkit-docs/terra-functional-testing/upgrade-guides/version-1-upgrade-guide#upgrading-tests">Terra
+    Upgrade Guide</a> for details.</p>
+<p>This is executed only when the project uses terra-functional-testing, not the legacy terra-toolkit.</p>
+</body>
+</html>
diff --git a/src/main/resources/inspectionDescriptions/ReplaceTerraItWithTerraValidates.html b/src/main/resources/inspectionDescriptions/ReplaceTerraItWithTerraValidates.html
new file mode 100644
index 0000000..fe1b99a
--- /dev/null
+++ b/src/main/resources/inspectionDescriptions/ReplaceTerraItWithTerraValidates.html
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright 2021 Tamás Balog
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<html>
+<body>
+<!-- tooltip end -->
+<p>This inspection reports usage of <code>Terra.it</code> helpers, and provides quick fixes to replace them with their
+    <code>Terra.validates></code> counterparts.
+<p>
+    All three Terra.it helpers are supported, and based on the presence of before hooks, alternative quick fixes may be
+    available to merge the particular Terra.it with the <code>before</code> hook before it.
+<p>
+    For specific examples, please head to the [plugin documentation](https://github.com/picimako/terra-support/blob/master/docs/terra_helpers.md).
+</body>
+</html>
diff --git a/src/main/resources/messages/TerraBundle.properties b/src/main/resources/messages/TerraBundle.properties
index eead1ca..a63e75b 100644
--- a/src/main/resources/messages/TerraBundle.properties
+++ b/src/main/resources/messages/TerraBundle.properties
@@ -1,5 +1,5 @@
 #
-# Copyright 2020 Tamás Balog
+# Copyright 2020 Tamás Balog
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+# Inspections
 terra.inspection.matches.global.selector=This selector matches the global selector defined in wdio.conf.js. It may be removed from here.
 terra.inspection.no.screenshot.exists=No reference screenshot exists for any context, for the name specified.
 terra.inspection.no.screenshot.exists.for.default=No reference screenshot exists for any context, for the default name.
@@ -29,6 +30,18 @@ terra.inspection.no.actual.viewport.specified=There is no actual viewport specif
 terra.inspection.non.array.viewports.not.allowed=Non-array-type values are not allowed for the viewports argument.
 terra.inspection.duplicate.viewports=There are duplicate viewport values in this block.
 terra.inspection.viewports.not.in.ascending.order=Viewports are not in ascending order by their widths.
+terra.inspection.invalid.terra.validation.property=This is not a valid property for this validation. The valid ones to use are: {0}
+terra.inspection.replace.terra.it.simple=Convert to Terra.validates form
+terra.inspection.replace.terra.it.before.unchanged=Convert to Terra.validates form (before hook unaltered)
+terra.inspection.replace.terra.it.before.merged=Convert to Terra.validates form (merge with before hook)
+terra.inspection.replace.message=Terra.it calls should be replaced with Terra.validates ones. Terra.it is deprecated in terra-toolkit, and is no longer available in terra-functional-testing.
+terra.inspection.replace.family.name=Terra.it over Terra.validates
+terra.inspection.screenshot.name.argument.missing=The name argument must be specified.
+terra.inspection.duplicate.screenshot.name=There is more than one assertion specified with this screenshot name. That is not allowed in terra-functional-testing.
+
+# Tool window
+terra.wdio.toolwindow.root.node.name=Wdio Resources
+terra.wdio.toolwindow.root.node.name.with.stat=Wdio Resources ({0} {0,choice,0#specs|1#spec|2#specs}, {1} {1,choice,0#screenshots|1#screenshot|2#screenshots})
 terra.wdio.toolwindow.find.unused.screenshots=Analyze project
 terra.wdio.toolwindow.find.unused.screenshots.description=Analyzes the project for unused screenshots
 terra.wdio.toolwindow.compare.latests.with.references=Compare Latests With References
@@ -53,16 +66,24 @@ terra.wdio.toolwindow.screenshot.navigate.to.usage.no.validation.call.title=No S
 terra.wdio.toolwindow.screenshot.navigate.to.usage.no.validation.call.message=There is no validation linked to this screenshot.\nEither it has been removed entirely or is now referencing this image by a different name.
 terra.wdio.toolwindow.statistics.toggle=Toggle Statistics
 terra.wdio.toolwindow.statistics.toggle.description=Shows/hides spec and screenshot counts, and overall project wdio statistics
+
+# Project view actions
 terra.wdio.project.view.screenshot.navigate.to.usage=Navigate to Screenshot Usage
+
+# Gutter icon
 terra.wdio.screenshot.gutter.navigate.to.related=Navigate to related screenshots
 terra.wdio.screenshot.gutter.validation.on.this.line=Screenshot validation happens on this line
 terra.screenshot.linemarker.name=Terra Screenshot
+
+# Settings
 terra.settings.tab.title=Terra Support Settings
 terra.settings.wdio.paths.section.title=Wdio Root Paths
 terra.settings.wdio.paths.column.title=Root Path
 terra.settings.wdio.paths.note=These paths are relative to the project's root. They should not include the / character at their beginnings.<br>The Terra Wdio tool window uses only a single wdio root path from this list, first found in the project.
 terra.settings.terra.wdio.tool.window.section.title=Terra Wdio Tool Window
 terra.settings.confirm.screenshot.deletion=Show confirmation dialog before screenshot deletion
+
+# Inlay hints
 terra.inlay.hints.type.title=Terra Screenshot
 terra.inlay.hints.option.main=Show hints
 terra.inlay.hints.option.screenshot.name=Screenshot names:
diff --git a/src/main/resources/messages/TerraQuickDocBundle.properties b/src/main/resources/messages/TerraQuickDocBundle.properties
new file mode 100644
index 0000000..1bf16c7
--- /dev/null
+++ b/src/main/resources/messages/TerraQuickDocBundle.properties
@@ -0,0 +1,47 @@
+###### terra-toolkit variants ######
+tt.Terra.it=terra.toolkit.quick.doc.utility.dev.guide
+tt.Terra.validates=terra.toolkit.quick.doc.test.assertion.helpers
+tt.Terra.it.matchesScreenshot=terra.toolkit.quick.doc.test.assertion.helpers
+tt.Terra.it.validatesElement=terra.toolkit.quick.doc.test.assertion.helpers,terra.toolkit.quick.doc.axe.rules
+tt.Terra.it.isAccessible=terra.toolkit.quick.doc.test.assertion.helpers,terra.toolkit.quick.doc.axe.rules
+tt.Terra.validates.screenshot=terra.toolkit.quick.doc.test.assertion.helpers
+tt.Terra.validates.element=terra.toolkit.quick.doc.test.assertion.helpers,terra.toolkit.quick.doc.axe.rules
+tt.Terra.validates.accessibility=terra.toolkit.quick.doc.test.assertion.helpers,terra.toolkit.quick.doc.axe.rules
+tt.Terra.hideInputCaret=terra.toolkit.quick.doc.test.setup.helpers
+tt.Terra.viewports=terra.toolkit.quick.doc.test.setup.helpers
+tt.Terra.describeViewports=terra.toolkit.quick.doc.test.setup.helpers
+
+###### terra-functional-testing variants ######
+tft.Terra.it=terra.functional.testing.v1.upgrade.guide
+tft.Terra.validates=terra.functional.testing.doc
+tft.Terra.it.matchesScreenshot=terra.functional.testing.v1.upgrade.guide
+tft.Terra.it.validatesElement=terra.functional.testing.v1.upgrade.guide
+tft.Terra.it.isAccessible=terra.functional.testing.v1.upgrade.guide
+tft.Terra.validates.screenshot=terra.functional.testing.doc.screenshot
+tft.Terra.validates.element=terra.functional.testing.doc.accessibility
+tft.Terra.validates.accessibility=terra.functional.testing.doc.accessibility
+tft.Terra.hideInputCaret=terra.functional.testing.doc.additional.utilities
+tft.Terra.viewports=terra.functional.testing.v1.upgrade.guide
+tft.Terra.describeViewports=terra.functional.testing.doc.describe.helpers
+
+###### Value properties ######
+terra.toolkit.quick.doc.utility.dev.guide.label=Webdriver.io Utility Developer's Guide
+terra.toolkit.quick.doc.utility.dev.guide.url=https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md
+terra.toolkit.quick.doc.test.setup.helpers.label=Webdriver.io Utility Developer's Guide / Test Setup Helpers
+terra.toolkit.quick.doc.test.setup.helpers.url=https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md#test-setup-helpers
+terra.toolkit.quick.doc.test.assertion.helpers.label=Webdriver.io Utility Developer's Guide / Test Assertion Helpers
+terra.toolkit.quick.doc.test.assertion.helpers.url=https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md#test-assertion-helpers
+terra.toolkit.quick.doc.axe.rules.label=Axe Accessibility Rule Descriptions
+terra.toolkit.quick.doc.axe.rules.url=https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md
+terra.functional.testing.doc.label=Terra Functional Testing
+terra.functional.testing.doc.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about
+terra.functional.testing.doc.screenshot.label=Terra Functional Testing / Screenshot Testing
+terra.functional.testing.doc.screenshot.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about#screenshot-testing
+terra.functional.testing.doc.accessibility.label=Accessibility Testing
+terra.functional.testing.doc.accessibility.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about#accessibility-testing
+terra.functional.testing.doc.additional.utilities.label=Additional Utilities
+terra.functional.testing.doc.additional.utilities.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about#additional-utilities
+terra.functional.testing.doc.describe.helpers.label=Describe Helpers
+terra.functional.testing.doc.describe.helpers.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/about#describe-helpers
+terra.functional.testing.v1.upgrade.guide.label=Terra Functional Testing - Version 1 Upgrade Guide
+terra.functional.testing.v1.upgrade.guide.url=https://engineering.cerner.com/terra-ui/dev_tools/cerner/terra-functional-testing/upgrade-guides/version-1-upgrade-guide
diff --git a/src/test/java/com/picimako/terra/FileTypePreconditionsTest.java b/src/test/java/com/picimako/terra/FileTypePreconditionsTest.java
index c966b9e..fdc3baa 100644
--- a/src/test/java/com/picimako/terra/FileTypePreconditionsTest.java
+++ b/src/test/java/com/picimako/terra/FileTypePreconditionsTest.java
@@ -45,6 +45,22 @@ public void shouldNotBeInWdioSpecFile() {
         assertThat(FileTypePreconditions.isInWdioSpecFile(psiElement)).isFalse();
     }
 
+    //isWdioSpecFile
+
+    @Test
+    public void shouldBeWdioSpecFile() {
+        PsiFile psiElement = mockPsiFile("some-spec.js");
+
+        assertThat(FileTypePreconditions.isWdioSpecFile(psiElement)).isTrue();
+    }
+
+    @Test
+    public void shouldNotBeWdioSpecFile() {
+        PsiFile psiElement = mockPsiFile("some-test.js");
+
+        assertThat(FileTypePreconditions.isWdioSpecFile(psiElement)).isFalse();
+    }
+
     //isInAppJsxFile
 
     @Test
@@ -68,4 +84,10 @@ private PsiElement mockPsiElement(String fileName) {
         when(containingFile.getName()).thenReturn(fileName);
         return psiElement;
     }
+    
+    private PsiFile mockPsiFile(String fileName) {
+        PsiFile file = mock(PsiFile.class);
+        when(file.getName()).thenReturn(fileName);
+        return file;
+    }
 }
diff --git a/src/test/java/com/picimako/terra/TerraFunctionalTestingTestCase.java b/src/test/java/com/picimako/terra/TerraFunctionalTestingTestCase.java
new file mode 100644
index 0000000..ac42620
--- /dev/null
+++ b/src/test/java/com/picimako/terra/TerraFunctionalTestingTestCase.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra;
+
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.wdio.TerraFunctionalTestingManager;
+import com.picimako.terra.wdio.TerraResourceManager;
+
+/**
+ * A terra-functional-testing aware implementation of {@code BasePlatformTestCase}.
+ */
+public abstract class TerraFunctionalTestingTestCase extends BasePlatformTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TerraResourceManager.getInstance(getProject(), TerraFunctionalTestingManager.class);
+    }
+
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/TerraToolkitTestCase.java b/src/test/java/com/picimako/terra/TerraToolkitTestCase.java
new file mode 100644
index 0000000..fb56b33
--- /dev/null
+++ b/src/test/java/com/picimako/terra/TerraToolkitTestCase.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra;
+
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.TerraToolkitManager;
+
+/**
+ * A terra-toolkit aware implementation of {@code BasePlatformTestCase}.
+ */
+public abstract class TerraToolkitTestCase extends BasePlatformTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TerraResourceManager.getInstance(getProject(), TerraToolkitManager.class);
+    }
+
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProviderTest.java b/src/test/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProviderTest.java
index 2b5ebd5..d15a5ab 100644
--- a/src/test/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProviderTest.java
+++ b/src/test/java/com/picimako/terra/documentation/TerraDescribeViewportsDocumentationProviderTest.java
@@ -17,23 +17,16 @@
 package com.picimako.terra.documentation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.when;
 
 import com.intellij.lang.documentation.DocumentationProvider;
-import com.intellij.lang.javascript.psi.JSArgumentList;
-import com.intellij.lang.javascript.psi.JSArrayLiteralExpression;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.lang.javascript.psi.JSReferenceExpression;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import com.intellij.psi.PsiElement;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraDescribeViewportsDocumentationProvider}.
  */
-@RunWith(MockitoJUnitRunner.class)
-public class TerraDescribeViewportsDocumentationProviderTest {
+public class TerraDescribeViewportsDocumentationProviderTest extends TerraToolkitTestCase {
 
     private static final String DOCUMENTATION_HTML = "<div class='definition'><pre>huge</pre></div>"
         + "<div class='content'>"
@@ -41,67 +34,59 @@ public class TerraDescribeViewportsDocumentationProviderTest {
         + "<tr><td valign='top' class='section'><p>Minimum value: </td><td valign='top'>1216px</td><td valign='top'></td>"
         + "<tr><td valign='top' class='section'><p>Media Query: </td><td valign='top'><code>@media screen and (min-width: 1216px)</code></td>"
         + "<tr><td valign='top' class='section'><p>Description: </td><td valign='top'>Active from viewport width 1216px and up</td></table></div>";
-    @Mock
-    private JSLiteralExpression jsLiteralExpression;
-    @Mock
-    private JSArrayLiteralExpression jsArrayLiteralExpression;
-    @Mock
-    private JSArgumentList jsArgumentList;
-    @Mock
-    private JSReferenceExpression jsReferenceExpression;
-
-    @Test
-    public void shouldReturnDocumentationForViewport() {
-        mockCommonPsi();
-        when(jsReferenceExpression.getCanonicalText()).thenReturn("Terra.describeViewports");
-        when(jsLiteralExpression.getStringValue()).thenReturn("huge");
-
-        DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
-
-        assertThat(documentationProvider.generateDoc(jsLiteralExpression, null)).isEqualTo(DOCUMENTATION_HTML);
-    }
 
-    @Test
-    public void shouldReturnNullWhenInputElementIsNotStringLiteral() {
-        DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
+    private final DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
+
+    public void testShouldReturnDocumentationForViewport() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['hug<caret>e'], () => {\n" +
+                "});");
 
-        assertThat(documentationProvider.generateDoc(jsArrayLiteralExpression, null)).isNull();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+
+        assertThat(documentationProvider.generateDoc(element, null)).isEqualTo(DOCUMENTATION_HTML);
     }
 
-    @Test
-    public void shouldReturnNullWhenInputElementIsLiteralButNotString() {
-        when(jsLiteralExpression.isStringLiteral()).thenReturn(false);
+    public void testShouldReturnNullWhenInputElementIsNotStringLiteral() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['hug<caret>e'], () => {\n" +
+                "});");
 
-        DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
 
-        assertThat(documentationProvider.generateDoc(jsLiteralExpression, null)).isNull();
+        assertThat(documentationProvider.generateDoc(element, null)).isNull();
     }
 
-    @Test
-    public void shouldReturnNullWhenTheStringLiteralIsNotInTerraDescribeViewports() {
-        mockCommonPsi();
-        when(jsReferenceExpression.getCanonicalText()).thenReturn("Terra.validates.element");
+    public void testShouldReturnNullWhenInputElementIsLiteralButNotString() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', [2<caret>0], () => {\n" +
+                "});");
 
-        DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
 
-        assertThat(documentationProvider.generateDoc(jsLiteralExpression, null)).isNull();
+        assertThat(documentationProvider.generateDoc(element, null)).isNull();
     }
 
-    @Test
-    public void shouldReturnNullWhenTheViewportIsNotSupportedByTerra() {
-        mockCommonPsi();
-        when(jsReferenceExpression.getCanonicalText()).thenReturn("Terra.describeViewports");
-        when(jsLiteralExpression.getStringValue()).thenReturn("notsupportedviewport");
+    public void testShouldReturnNullWhenTheStringLiteralIsNotInTerraDescribeViewports() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['huge'], () => {\n" +
+                "    describe('terra screenshot', () => {\n" +
+                "       Terra.validates.element('coll<caret>ect');\n" +
+                "    });" +
+                "});");
 
-        DocumentationProvider documentationProvider = new TerraDescribeViewportsDocumentationProvider();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
 
-        assertThat(documentationProvider.generateDoc(jsLiteralExpression, null)).isNull();
+        assertThat(documentationProvider.generateDoc(element, null)).isNull();
     }
 
-    private void mockCommonPsi() {
-        when(jsLiteralExpression.getParent()).thenReturn(jsArrayLiteralExpression);
-        when(jsLiteralExpression.isStringLiteral()).thenReturn(true);
-        when(jsArrayLiteralExpression.getParent()).thenReturn(jsArgumentList);
-        when(jsArgumentList.getPrevSibling()).thenReturn(jsReferenceExpression);
+    public void testShouldReturnNullWhenTheViewportIsNotSupportedByTerra() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['ginor<caret>mous'], () => {\n" +
+                "});");
+
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+
+        assertThat(documentationProvider.generateDoc(element, null)).isNull();
     }
 }
diff --git a/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationProviderTest.java b/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationProviderTest.java
index 3d5852b..c98593e 100644
--- a/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationProviderTest.java
+++ b/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationProviderTest.java
@@ -17,27 +17,15 @@
 package com.picimako.terra.documentation;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.when;
 
-import java.util.Properties;
-
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.psi.PsiElement;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-import com.intellij.util.ReflectionUtil;
-import org.jetbrains.annotations.NotNull;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 
-import com.picimako.terra.FileTypePreconditions;
-import com.picimako.terra.wdio.TerraWdioPsiUtil;
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraWdioDocumentationProvider}.
  */
-public class TerraWdioDocumentationProviderTest extends BasePlatformTestCase {
+public class TerraWdioDocumentationProviderTest extends TerraToolkitTestCase {
 
     private final TerraWdioDocumentationProvider provider = new TerraWdioDocumentationProvider();
 
@@ -46,82 +34,35 @@ public void testReturnNoDocumentationWhenNoOriginalElement() {
     }
 
     public void testReturnNoDocumentationWhenContainingFileIsNotASpecFile() {
-        PsiElement originalElement = mock(PsiElement.class);
-        try (MockedStatic<FileTypePreconditions> fileTypeUtil = Mockito.mockStatic(FileTypePreconditions.class)) {
-            fileTypeUtil.when(() -> FileTypePreconditions.isInWdioSpecFile(originalElement)).thenReturn(false);
-
-            assertThat(provider.generateDoc(null, originalElement)).isNull();
-        }
-    }
+        myFixture.configureByText("WdioDocumentation.js",
+            "describe('terra screenshot', () => {\n" +
+                "    Terra.validates.<caret>element('collect');\n" +
+                "});");
 
-    public void testReturnNoDocumentationWhenOriginalElementIsNotTerraWdio() {
-        PsiElement originalElement = mock(PsiElement.class);
-        try (MockedStatic<TerraWdioPsiUtil> importUtil = Mockito.mockStatic(TerraWdioPsiUtil.class);
-             MockedStatic<FileTypePreconditions> fileTypeUtil = Mockito.mockStatic(FileTypePreconditions.class)) {
-            fileTypeUtil.when(() -> FileTypePreconditions.isInWdioSpecFile(originalElement)).thenReturn(true);
-            importUtil.when(() -> TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(originalElement)).thenReturn(false);
-
-            assertThat(provider.generateDoc(null, originalElement)).isNull();
-        }
-    }
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
 
-    public void testLoadsAndGeneratesDocumentationWhenServiceIsNotYetLoaded() {
-        TerraWdioDocumentationService service = mock(TerraWdioDocumentationService.class);
-        PsiElement element = mock(PsiElement.class);
-        PsiElement originalElement = mockOriginalElement();
-        when(service.getDocs()).thenReturn(setupProperties());
-
-        try (MockedStatic<TerraWdioPsiUtil> terraUtil = Mockito.mockStatic(TerraWdioPsiUtil.class);
-             MockedStatic<FileTypePreconditions> fileTypeUtil = Mockito.mockStatic(FileTypePreconditions.class);
-             MockedStatic<ServiceManager> serviceManager = Mockito.mockStatic(ServiceManager.class)) {
-            fileTypeUtil.when(() -> FileTypePreconditions.isInWdioSpecFile(originalElement)).thenReturn(true);
-            terraUtil.when(() -> TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(originalElement)).thenReturn(true);
-            serviceManager.when(() -> ServiceManager.getService(TerraWdioDocumentationService.class)).thenReturn(service);
-
-            assertThat(provider.generateDoc(element, originalElement)).isEqualTo("null<div class='content'><a href=\"https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md#test-assertion-helpers\">Webdriver.io Utility Developer's Guide / Test Assertion Helpers</a><br><a href=\"https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md\">Axe Accessibility Rule Descriptions</a></div>");
-
-            serviceManager.verify(
-                times(1),
-                () -> ServiceManager.getService(TerraWdioDocumentationService.class));
-        }
+        assertThat(provider.generateDoc(null, element)).isNull();
     }
 
-    public void testLoadsAndGeneratesDocumentationWhenServiceIsAlreadyLoaded() {
-        PsiElement element = mock(PsiElement.class);
-        PsiElement originalElement = mockOriginalElement();
-        setProviderDocumentation(setupProperties());
-
-        try (MockedStatic<TerraWdioPsiUtil> terraUtil = Mockito.mockStatic(TerraWdioPsiUtil.class);
-             MockedStatic<FileTypePreconditions> fileTypeUtil = Mockito.mockStatic(FileTypePreconditions.class);
-             MockedStatic<ServiceManager> serviceManager = Mockito.mockStatic(ServiceManager.class)) {
-            fileTypeUtil.when(() -> FileTypePreconditions.isInWdioSpecFile(originalElement)).thenReturn(true);
-            terraUtil.when(() -> TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(originalElement)).thenReturn(true);
+    public void testReturnNoDocumentationWhenOriginalElementIsNotTerraWdio() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "descri<caret>be('terra screenshot', () => {\n" +
+                "    Terra.validates.element('collect');\n" +
+                "});");
 
-            assertThat(provider.generateDoc(element, originalElement)).isEqualTo("null<div class='content'><a href=\"https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md#test-assertion-helpers\">Webdriver.io Utility Developer's Guide / Test Assertion Helpers</a><br><a href=\"https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md\">Axe Accessibility Rule Descriptions</a></div>");
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
 
-            serviceManager.verify(
-                times(0),
-                () -> ServiceManager.getService(TerraWdioDocumentationService.class));
-        }
+        assertThat(provider.generateDoc(null, element)).isNull();
     }
 
-    @NotNull
-    private PsiElement mockOriginalElement() {
-        PsiElement originalElement = mock(PsiElement.class);
-        PsiElement parent = mock(PsiElement.class);
-        when(originalElement.getParent()).thenReturn(parent);
-        when(parent.getText()).thenReturn("Terra.it.isAccessible");
-        return originalElement;
-    }
+    public void testGeneratesDocumentation() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "describe('terra screenshot', () => {\n" +
+                "    Terra.validates.access<caret>ibility('collect');\n" +
+                "});");
 
-    @NotNull
-    private Properties setupProperties() {
-        Properties properties = new Properties();
-        properties.put("Terra.it.isAccessible", "{terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers,Axe Accessibility Rule Descriptions|https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md");
-        return properties;
-    }
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
 
-    private void setProviderDocumentation(Properties properties) {
-        ReflectionUtil.setField(TerraWdioDocumentationProvider.class, provider, Properties.class, "documentation", properties);
+        assertThat(provider.generateDoc(element, element)).isEqualTo("null<div class='content'><a href=\"https://github.com/cerner/terra-toolkit-boneyard/blob/main/docs/Wdio_Utility.md#test-assertion-helpers\">Webdriver.io Utility Developer's Guide / Test Assertion Helpers</a><br><a href=\"https://github.com/dequelabs/axe-core/blob/develop/doc/rule-descriptions.md\">Axe Accessibility Rule Descriptions</a></div>");
     }
 }
diff --git a/src/test/java/com/picimako/terra/psi/js/JSArgumentUtilTest.java b/src/test/java/com/picimako/terra/psi/js/JSArgumentUtilTest.java
index 8c69936..bfa1b89 100644
--- a/src/test/java/com/picimako/terra/psi/js/JSArgumentUtilTest.java
+++ b/src/test/java/com/picimako/terra/psi/js/JSArgumentUtilTest.java
@@ -37,6 +37,32 @@
  */
 public class JSArgumentUtilTest {
 
+    //getArgumentListOf
+
+    @Test
+    public void shouldReturnArgumentList() {
+        JSExpressionStatement element = mock(JSExpressionStatement.class);
+        JSCallExpression jsCallExpression = mock(JSCallExpression.class);
+        JSArgumentList argumentList = mock(JSArgumentList.class);
+        when(jsCallExpression.getArgumentList()).thenReturn(argumentList);
+        try (MockedStatic<JSPsiUtil> util = Mockito.mockStatic(JSPsiUtil.class)) {
+            util.when(() -> JSPsiUtil.getCallExpression(element)).thenReturn(jsCallExpression);
+
+            assertThat(JSArgumentUtil.getArgumentListOf(element)).isSameAs(argumentList);
+        }
+    }
+
+    @Test
+    public void shouldNotReturnArgumentList() {
+        JSExpressionStatement element = mock(JSExpressionStatement.class);
+        JSCallExpression jsCallExpression = mock(JSCallExpression.class);
+        try (MockedStatic<JSPsiUtil> util = Mockito.mockStatic(JSPsiUtil.class)) {
+            util.when(() -> JSPsiUtil.getCallExpression(element)).thenReturn(jsCallExpression);
+
+            assertThat(JSArgumentUtil.getArgumentListOf(element)).isNull();
+        }
+    }
+
     //getArgumentsOf
 
     @Test
diff --git a/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingInspectionTestCase.java b/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingInspectionTestCase.java
new file mode 100644
index 0000000..fc36553
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingInspectionTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import com.intellij.testFramework.LightProjectDescriptor;
+
+/**
+ * A terra-functional-testing aware implementation of {@code TerraInspectionBaseTestCase}.
+ */
+public abstract class TerraFunctionalTestingInspectionTestCase extends TerraInspectionBaseTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TerraResourceManager.getInstance(getProject(), TerraFunctionalTestingManager.class);
+    }
+
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingSpecFolderCollectorTest.java b/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingSpecFolderCollectorTest.java
new file mode 100644
index 0000000..c5313fc
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/TerraFunctionalTestingSpecFolderCollectorTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+/**
+ * Unit test for {@link SpecFolderCollector}.
+ */
+public class TerraFunctionalTestingSpecFolderCollectorTest extends BasePlatformTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "testdata/terra/functestroot";
+    }
+
+    public void testCollectSpecFolders() {
+        myFixture.copyFileToProject("package.json");
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/latest/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png");
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png");
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/FindUnusedScreenshot-spec/terra_screenshot.png");
+
+        List<VirtualFile> filesAndFoldersInWdioRoot = VfsUtil.collectChildrenRecursively(TerraWdioFolders.projectWdioRoot(getProject()));
+        List<VirtualFile> latests = TerraResourceManager.getInstance(getProject()).specFolderCollector().collectSpecFoldersForTypeInside("latest", filesAndFoldersInWdioRoot).collect(toList());
+
+        assertThat(latests).hasSize(1);
+        assertThat(latests.get(0).getPath()).isEqualTo("/src/tests/wdio/__snapshots__/latest/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec");
+    }
+
+    //To fix the test failure when copying package.json to the project
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/TerraInspectionBaseTestCase.java b/src/test/java/com/picimako/terra/wdio/TerraInspectionBaseTestCase.java
index bc689e0..fd3eba6 100644
--- a/src/test/java/com/picimako/terra/wdio/TerraInspectionBaseTestCase.java
+++ b/src/test/java/com/picimako/terra/wdio/TerraInspectionBaseTestCase.java
@@ -60,6 +60,14 @@ protected void doWdioSpecTest() {
         doCustomFileTest("", ".js", null, "-spec");
     }
 
+    protected void doQuickFixTest(String filename, String quickFixName) {
+        myFixture.configureByFile(filename + "-spec.js");
+        myFixture.enableInspections(getInspection());
+        myFixture.doHighlighting();
+        myFixture.launchAction(myFixture.findSingleIntention(quickFixName));
+        myFixture.checkResultByFile(filename + "-spec.after.js");
+    }
+
     /**
      * Loads a test data file into the virtual file system, corresponding to the unit test method's name, then executes
      * it and validates highlighting.
diff --git a/src/test/java/com/picimako/terra/wdio/TerraToolkitInspectionTestCase.java b/src/test/java/com/picimako/terra/wdio/TerraToolkitInspectionTestCase.java
new file mode 100644
index 0000000..bc290e0
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/TerraToolkitInspectionTestCase.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import com.intellij.testFramework.LightProjectDescriptor;
+
+/**
+ * A terra-toolkit aware implementation of {@code TerraInspectionBaseTestCase}.
+ */
+public abstract class TerraToolkitInspectionTestCase extends TerraInspectionBaseTestCase {
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TerraResourceManager.getInstance(getProject(), TerraToolkitManager.class);
+    }
+
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/TerraToolkitSpecFolderCollectorTest.java b/src/test/java/com/picimako/terra/wdio/TerraToolkitSpecFolderCollectorTest.java
new file mode 100644
index 0000000..78c4944
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/TerraToolkitSpecFolderCollectorTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio;
+
+import static java.util.stream.Collectors.toList;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.List;
+
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+
+import com.picimako.terra.TerraToolkitTestCase;
+
+/**
+ * Unit test for {@link SpecFolderCollector}.
+ */
+public class TerraToolkitSpecFolderCollectorTest extends TerraToolkitTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "testdata/terra/projectroot";
+    }
+
+    public void testCollectSpecFolders() {
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/latest/en/chrome_huge/some-spec/testimage[default].png");
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/diff/en/chrome_huge/some-spec/testimage[default].png");
+        myFixture.copyFileToProject("tests/wdio/__snapshots__/reference/en/chrome_huge/some-spec/testimage[default].png");
+
+        List<VirtualFile> filesAndFoldersInWdioRoot = VfsUtil.collectChildrenRecursively(TerraWdioFolders.projectWdioRoot(getProject()));
+        List<VirtualFile> diffs = TerraResourceManager.getInstance(getProject()).specFolderCollector().collectSpecFoldersForTypeInside("diff", filesAndFoldersInWdioRoot).collect(toList());
+
+        assertThat(diffs).hasSize(1);
+        assertThat(diffs.get(0).getPath()).isEqualTo("/src/tests/wdio/__snapshots__/diff/en/chrome_huge/some-spec");
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/TerraWdioFoldersTest.java b/src/test/java/com/picimako/terra/wdio/TerraWdioFoldersTest.java
index 5f477fe..ecf9964 100644
--- a/src/test/java/com/picimako/terra/wdio/TerraWdioFoldersTest.java
+++ b/src/test/java/com/picimako/terra/wdio/TerraWdioFoldersTest.java
@@ -87,20 +87,6 @@ public void testReturnRelativePath() {
         assertThat(TerraWdioFolders.getRelativePathToProjectDir(getProject(), TerraWdioFolders.projectWdioRoot(getProject()))).isEqualTo("tests/wdio");
     }
 
-    // collectSpecFoldersInside
-
-    public void testCollectSpecFolders() {
-        myFixture.copyFileToProject("tests/wdio/__snapshots__/latest/en/chrome_huge/some-spec/testimage[default].png");
-        myFixture.copyFileToProject("tests/wdio/__snapshots__/diff/en/chrome_huge/some-spec/testimage[default].png");
-        myFixture.copyFileToProject("tests/wdio/__snapshots__/reference/en/chrome_huge/some-spec/testimage[default].png");
-
-        List<VirtualFile> filesAndFoldersInWdioRoot = VfsUtil.collectChildrenRecursively(TerraWdioFolders.projectWdioRoot(getProject()));
-        List<VirtualFile> diffs = TerraWdioFolders.collectSpecFoldersInside("diff", filesAndFoldersInWdioRoot).collect(toList());
-
-        assertThat(diffs).hasSize(1);
-        assertThat(diffs.get(0).getPath()).isEqualTo("/src/tests/wdio/__snapshots__/diff/en/chrome_huge/some-spec");
-    }
-
     // collectSpecFiles
 
     public void testCollectSpecFilesFromAll() {
diff --git a/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilScreenshotPropertyTest.java b/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilScreenshotPropertyTest.java
index 8564392..79b0af7 100644
--- a/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilScreenshotPropertyTest.java
+++ b/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilScreenshotPropertyTest.java
@@ -31,6 +31,8 @@
  */
 public class TerraWdioPsiUtilScreenshotPropertyTest extends BasePlatformTestCase {
 
+    // getScreenshotValidationProperty
+
     public void testPropertyRetrieval() {
         Object[][] testCases = new Object[][]{
             {"describe('Terra screenshot', () => {\n" +
@@ -79,4 +81,31 @@ public void testPropertyRetrieval() {
             }
         }
     }
+
+    // getTerraValidationProperties
+
+
+    public void testRetrievesTerraValidationProperties() {
+        myFixture.configureByText("Terra-spec.js", "describe('Terra screenshot', () => {\n" +
+            "    it('Test case', () => {\n" +
+            "        <caret>Terra.validates.screenshot('test id', { selector: '#selector', mismatchTolerance: 0.5 });\n" +
+            "    });\n" +
+            "});");
+
+        JSExpressionStatement element = PsiTreeUtil.getParentOfType(myFixture.getFile().findElementAt(myFixture.getCaretOffset()), JSExpressionStatement.class);
+
+        assertThat(TerraWdioPsiUtil.getTerraValidationProperties(element)).extracting(JSProperty::getName).containsExactly("selector", "mismatchTolerance");
+    }
+
+    public void testNoTerraValidationProperties() {
+        myFixture.configureByText("Terra-spec.js", "describe('Terra screenshot', () => {\n" +
+            "    it('Test case', () => {\n" +
+            "        <caret>Terra.validates.screenshot('test id');\n" +
+            "    });\n" +
+            "});");
+
+        JSExpressionStatement element = PsiTreeUtil.getParentOfType(myFixture.getFile().findElementAt(myFixture.getCaretOffset()), JSExpressionStatement.class);
+
+        assertThat(TerraWdioPsiUtil.getTerraValidationProperties(element)).isEmpty();
+    }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilTest.java b/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilTest.java
index baf8b95..26243eb 100644
--- a/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilTest.java
+++ b/src/test/java/com/picimako/terra/wdio/TerraWdioPsiUtilTest.java
@@ -24,24 +24,23 @@
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.JSExpressionStatement;
 import com.intellij.psi.PsiElement;
-import org.junit.Test;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraWdioPsiUtil}.
  */
-public class TerraWdioPsiUtilTest {
+public class TerraWdioPsiUtilTest extends TerraToolkitTestCase {
 
     //isSupportedViewport
 
-    @Test
-    public void shouldNotSupportViewport() {
+    public void testShouldNotSupportViewport() {
         assertThat(TerraWdioPsiUtil.isSupportedViewport("somenotsupported")).isFalse();
     }
 
     //getMethodExpressionOf
 
-    @Test
-    public void shouldReturnMethodExpression() {
+    public void testShouldReturnMethodExpression() {
         JSExpressionStatement psiElement = mock(JSExpressionStatement.class);
         JSCallExpression jsCallExpression = mock(JSCallExpression.class);
         when(psiElement.getExpression()).thenReturn(jsCallExpression);
@@ -51,8 +50,7 @@ public void shouldReturnMethodExpression() {
         assertThat(TerraWdioPsiUtil.getMethodExpressionOf(psiElement)).isSameAs(methodExpression);
     }
 
-    @Test
-    public void shouldNotReturnMethodExpressionWhenThereIsNoUnderlyingJSCallExpression() {
+    public void testShouldNotReturnMethodExpressionWhenThereIsNoUnderlyingJSCallExpression() {
         JSExpressionStatement psiElement = mock(JSExpressionStatement.class);
         when(psiElement.getExpression()).thenReturn(null);
 
@@ -61,8 +59,7 @@ public void shouldNotReturnMethodExpressionWhenThereIsNoUnderlyingJSCallExpressi
 
     //isAnyOfTerraWdioFunctions
 
-    @Test
-    public void shouldBeATerraWdioFunction() {
+    public void testShouldBeATerraWdioFunction() {
         PsiElement psiElement = mock(PsiElement.class);
         PsiElement parent = mock(PsiElement.class);
         when(psiElement.getParent()).thenReturn(parent);
@@ -71,8 +68,7 @@ public void shouldBeATerraWdioFunction() {
         assertThat(TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(psiElement)).isTrue();
     }
 
-    @Test
-    public void shouldNotBeATerraWdioFunction() {
+    public void testShouldNotBeATerraWdioFunction() {
         PsiElement psiElement = mock(PsiElement.class);
         PsiElement parent = mock(PsiElement.class);
         when(psiElement.getParent()).thenReturn(parent);
@@ -81,8 +77,7 @@ public void shouldNotBeATerraWdioFunction() {
         assertThat(TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(psiElement)).isFalse();
     }
 
-    @Test
-    public void shouldNotBeATerraWdioFunctionIfThereIsNoParent() {
+    public void testShouldNotBeATerraWdioFunctionIfThereIsNoParent() {
         PsiElement psiElement = mock(PsiElement.class);
 
         assertThat(TerraWdioPsiUtil.isAnyOfTerraWdioFunctions(psiElement)).isFalse();
@@ -90,40 +85,55 @@ public void shouldNotBeATerraWdioFunctionIfThereIsNoParent() {
 
     //hasText
 
-    @Test
-    public void shouldHaveText() {
-        JSExpressionStatement psiElement = mockExpressionStatementFor("Terra.validates.screenshot");
+    public void testShouldHaveText() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['huge'], () => {\n" +
+                "    describe('terra screenshot', () => {\n" +
+                "       Terra.validates.el<caret>ement('collect');\n" +
+                "    });" +
+                "});");
+
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent().getParent().getParent();
 
-        assertThat(TerraWdioPsiUtil.hasText(psiElement, "Terra.validates.element", "Terra.validates.screenshot")).isTrue();
+        assertThat(TerraWdioPsiUtil.hasText(element, "Terra.validates.element", "Terra.validates.screenshot")).isTrue();
     }
 
-    @Test
-    public void shouldNotHaveTextWhenThereNoDesiredTextIsMatched() {
-        JSExpressionStatement psiElement = mockExpressionStatementFor("browser.pause");
+    public void testShouldNotHaveTextWhenThereNoDesiredTextIsMatched() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['huge'], () => {\n" +
+                "    describe('terra screenshot', () => {\n" +
+                "       browser.pau<caret>se(2000);\n" +
+                "    });" +
+                "});");
 
-        assertThat(TerraWdioPsiUtil.hasText(psiElement, "Terra.validates.element", "Terra.validates.screenshot")).isFalse();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent().getParent().getParent();
+
+        assertThat(TerraWdioPsiUtil.hasText(element, "Terra.validates.element", "Terra.validates.screenshot")).isFalse();
     }
 
-    @Test
-    public void shouldNotHaveTextWhenNoDesiredTextIsSpecified() {
-        PsiElement psiElement = mock(PsiElement.class);
+    public void testShouldNotHaveTextWhenNoDesiredTextIsSpecified() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['hu<caret>ge'], () => {\n" +
+                "});");
 
-        assertThat(TerraWdioPsiUtil.hasText(psiElement)).isFalse();
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
+
+        assertThat(TerraWdioPsiUtil.hasText(element)).isFalse();
     }
 
-    @Test
-    public void shouldNotHaveTextIfThereIsNoUnderlyingMethodExpression() {
-        //Mocks TerraWdioUtil#getMethodExpressionOf
-        JSExpressionStatement psiElement = mock(JSExpressionStatement.class);
-        when(psiElement.getExpression()).thenReturn(null);
+    public void testShouldNotHaveTextIfThereIsNoUnderlyingMethodExpression() {
+        myFixture.configureByText("WdioDocumentation-spec.js",
+            "Terra.describeViewports('viewports', ['hu<caret>ge'], () => {\n" +
+                "});");
+
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset());
 
-        assertThat(TerraWdioPsiUtil.hasText(psiElement, "Terra.validates.screenshot")).isFalse();
+        assertThat(TerraWdioPsiUtil.hasText(element, "Terra.validates.screenshot")).isFalse();
     }
 
     //isScreenshotValidationCall
 
-    @Test
-    public void shouldBeScreenshotValidationCall() {
+    public void testShouldBeScreenshotValidationCall() {
         JSCallExpression callExpression = mock(JSCallExpression.class);
         JSExpression methodExpression = mock(JSExpression.class);
         when(callExpression.getMethodExpression()).thenReturn(methodExpression);
@@ -132,13 +142,11 @@ public void shouldBeScreenshotValidationCall() {
         assertThat(TerraWdioPsiUtil.isScreenshotValidationCall(callExpression)).isTrue();
     }
 
-    @Test
-    public void shouldNotBeScreenshotValidationCallForNullExpression() {
+    public void testShouldNotBeScreenshotValidationCallForNullExpression() {
         assertThat(TerraWdioPsiUtil.isScreenshotValidationCall(null)).isFalse();
     }
 
-    @Test
-    public void shouldNotBeScreenshotValidationCall() {
+    public void testShouldNotBeScreenshotValidationCall() {
         JSCallExpression callExpression = mock(JSCallExpression.class);
         JSExpression methodExpression = mock(JSExpression.class);
         when(callExpression.getMethodExpression()).thenReturn(methodExpression);
@@ -146,15 +154,4 @@ public void shouldNotBeScreenshotValidationCall() {
 
         assertThat(TerraWdioPsiUtil.isScreenshotValidationCall(callExpression)).isFalse();
     }
-
-    private JSExpressionStatement mockExpressionStatementFor(String methodExpressionText) {
-        //Mocks TerraWdioUtil#getMethodExpressionOf
-        JSExpressionStatement psiElement = mock(JSExpressionStatement.class);
-        JSCallExpression jsCallExpression = mock(JSCallExpression.class);
-        when(psiElement.getExpression()).thenReturn(jsCallExpression);
-        JSExpression methodExpression = mock(JSExpression.class);
-        when(jsCallExpression.getMethodExpression()).thenReturn(methodExpression);
-        when(methodExpression.getText()).thenReturn(methodExpressionText);
-        return psiElement;
-    }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/ToScreenshotUsageNavigatorTest.java b/src/test/java/com/picimako/terra/wdio/ToScreenshotUsageNavigatorTest.java
index eb24e17..813880e 100644
--- a/src/test/java/com/picimako/terra/wdio/ToScreenshotUsageNavigatorTest.java
+++ b/src/test/java/com/picimako/terra/wdio/ToScreenshotUsageNavigatorTest.java
@@ -21,12 +21,13 @@
 
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.psi.PsiFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link ToScreenshotUsageNavigator}.
  */
-public class ToScreenshotUsageNavigatorTest extends BasePlatformTestCase {
+public class ToScreenshotUsageNavigatorTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
@@ -37,7 +38,7 @@ public void testNavigatesToDefaultScreenshotValidation() {
         PsiFile specFile = myFixture.configureByFile("tests/wdio/NavigateToScreenshotUsage-spec.js");
         myFixture.copyFileToProject(reference("/en/chrome_huge/NavigateToScreenshotUsage-spec/terra_screenshot[default].png"));
 
-        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator();
+        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator(getProject());
         navigator.navigateToUsage(specFile, "terra_screenshot[default].png");
 
         assertThat(FileEditorManager.getInstance(getProject()).isFileOpen(specFile.getVirtualFile())).isTrue();
@@ -48,7 +49,7 @@ public void testNavigatesToNonDefaultScreenshotValidation() {
         PsiFile specFile = myFixture.configureByFile("tests/wdio/NavigateToScreenshotUsage-spec.js");
         myFixture.copyFileToProject(reference("/en/chrome_huge/NavigateToScreenshotUsage-spec/terra_screenshot[non-default].png"));
 
-        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator();
+        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator(getProject());
         navigator.navigateToUsage(specFile, "terra_screenshot[non-default].png");
 
         assertThat(FileEditorManager.getInstance(getProject()).isFileOpen(specFile.getVirtualFile())).isTrue();
@@ -59,7 +60,7 @@ public void testDoesntNavigateToNotReferencedImage() {
         PsiFile specFile = myFixture.configureByFile("tests/wdio/NavigateToScreenshotUsage-spec.js");
         myFixture.copyFileToProject(reference("/en/chrome_huge/NavigateToScreenshotUsage-spec/terra_screenshot[not-referenced].png"));
 
-        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator();
+        ToScreenshotUsageNavigator navigator = new ToScreenshotUsageNavigator(getProject());
         navigator.navigateToUsage(specFile, "terra_screenshot[non-referenced].png");
 
         assertThat(FileEditorManager.getInstance(getProject()).isFileOpen(specFile.getVirtualFile())).isTrue();
diff --git a/src/test/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreviewTest.java b/src/test/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreviewTest.java
index 9f43353..21492e1 100644
--- a/src/test/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreviewTest.java
+++ b/src/test/java/com/picimako/terra/wdio/imagepreview/AbstractScreenshotsPreviewTest.java
@@ -25,13 +25,14 @@
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import org.jetbrains.annotations.NotNull;
 
+import com.picimako.terra.TerraToolkitTestCase;
+
 /**
  * Unit test for {@link AbstractScreenshotsPreview}.
  */
-public class AbstractScreenshotsPreviewTest extends BasePlatformTestCase {
+public class AbstractScreenshotsPreviewTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/imagepreview/DiffScreenshotsPreviewTest.java b/src/test/java/com/picimako/terra/wdio/imagepreview/DiffScreenshotsPreviewTest.java
index a69b852..a3b7f10 100644
--- a/src/test/java/com/picimako/terra/wdio/imagepreview/DiffScreenshotsPreviewTest.java
+++ b/src/test/java/com/picimako/terra/wdio/imagepreview/DiffScreenshotsPreviewTest.java
@@ -23,12 +23,13 @@
 import java.util.List;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link DiffScreenshotsPreview}.
  */
-public class DiffScreenshotsPreviewTest extends BasePlatformTestCase {
+public class DiffScreenshotsPreviewTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/imagepreview/ReferenceToLatestScreenshotsPreviewTest.java b/src/test/java/com/picimako/terra/wdio/imagepreview/ReferenceToLatestScreenshotsPreviewTest.java
index 3184437..4e0e273 100644
--- a/src/test/java/com/picimako/terra/wdio/imagepreview/ReferenceToLatestScreenshotsPreviewTest.java
+++ b/src/test/java/com/picimako/terra/wdio/imagepreview/ReferenceToLatestScreenshotsPreviewTest.java
@@ -24,14 +24,14 @@
 import java.util.List;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import com.picimako.terra.TerraToolkitTestCase;
 import com.picimako.terra.wdio.TerraWdioFolders;
 
 /**
  * Unit test for {@link ReferenceToLatestScreenshotsPreview}.
  */
-public class ReferenceToLatestScreenshotsPreviewTest extends BasePlatformTestCase {
+public class ReferenceToLatestScreenshotsPreviewTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/imagepreview/TerraFunctionalTestingScreenshotContextParserTest.java b/src/test/java/com/picimako/terra/wdio/imagepreview/TerraFunctionalTestingScreenshotContextParserTest.java
new file mode 100644
index 0000000..b822846
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/imagepreview/TerraFunctionalTestingScreenshotContextParserTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.imagepreview;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import com.picimako.terra.wdio.TerraFunctionalTestingScreenshotContextParser;
+
+/**
+ * Unit test for {@link TerraFunctionalTestingScreenshotContextParser}.
+ */
+public class TerraFunctionalTestingScreenshotContextParserTest {
+
+    @Test
+    public void shouldReturnScreenshotContextString() {
+        String path = "/home/project/tests/wdio/__snapshots__/diff/terra-theme/en/chrome_enormous/some-spec/a_screenshot.png";
+        assertThat(new TerraFunctionalTestingScreenshotContextParser().parse(path)).isEqualTo("terra-theme / en / chrome / enormous");
+    }
+
+    @Test
+    public void shouldReturnScreenshotContextStringFromNestedFolder() {
+        String path = "/home/project/tests/wdio/nested/__snapshots__/diff/terra-theme/en/chrome_enormous/some-spec/a_screenshot.png";
+        assertThat(new TerraFunctionalTestingScreenshotContextParser().parse(path)).isEqualTo("terra-theme / en / chrome / enormous");
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForAccessibilityTest.java b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForAccessibilityTest.java
new file mode 100644
index 0000000..878805b
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForAccessibilityTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+import com.picimako.terra.wdio.inspection.ReplaceTerraItWithTerraValidatesInspection;
+
+/**
+ * Unit test for {@link ReplaceTerraItWithTerraValidatesInspection}.
+ */
+public class ReplaceTerraItWithTerraValidatesInspectionForAccessibilityTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot/replaceit/accessibility";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new ReplaceTerraItWithTerraValidatesInspection();
+    }
+
+    public void testItValidatesAccessibilityToValidatesAccessibility() {
+        doQuickFixTest("ItValidatesAccessibility", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesAccessibilityWithArguments() {
+        doQuickFixTest("ItValidatesAccessibilityWithArguments", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForScreenshotTest.java b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForScreenshotTest.java
new file mode 100644
index 0000000..b836cc9
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionForScreenshotTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+import com.picimako.terra.wdio.inspection.ReplaceTerraItWithTerraValidatesInspection;
+
+/**
+ * Unit test for {@link ReplaceTerraItWithTerraValidatesInspection}.
+ */
+public class ReplaceTerraItWithTerraValidatesInspectionForScreenshotTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot/replaceit/screenshot";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new ReplaceTerraItWithTerraValidatesInspection();
+    }
+
+    public void testItValidatesScreenshotToValidatesScreenshot() {
+        doQuickFixTest("ItValidatesScreenshot", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesScreenshotWithName() {
+        doQuickFixTest("ItValidatesScreenshotWithName", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesScreenshotWithArguments() {
+        doQuickFixTest("ItValidatesScreenshotWithArguments", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionTest.java b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionTest.java
new file mode 100644
index 0000000..1ee0a2e
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/inspection/ReplaceTerraItWithTerraValidatesInspectionTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.resources.TerraBundle;
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+import com.picimako.terra.wdio.inspection.ReplaceTerraItWithTerraValidatesInspection;
+
+/**
+ * Unit test for {@link ReplaceTerraItWithTerraValidatesInspection}.
+ */
+public class ReplaceTerraItWithTerraValidatesInspectionTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot/replaceit/element";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new ReplaceTerraItWithTerraValidatesInspection();
+    }
+
+    public void testItValidatesElementToValidatesElement() {
+        doQuickFixTest("ItValidatesElement", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesElementWithName() {
+        doQuickFixTest("ItValidatesElementWithName", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesElementWithArguments() {
+        doQuickFixTest("ItValidatesElementWithArguments", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesElementWithBeforeHookUnchanged() {
+        doQuickFixTest("ItValidatesElementWithBeforeHookUnchanged", TerraBundle.inspection("replace.terra.it.before.unchanged"));
+    }
+
+    public void testItValidatesElementWithBeforeHook() {
+        doQuickFixTest("ItValidatesElementWithBeforeHook", TerraBundle.inspection("replace.terra.it.before.merged"));
+    }
+
+    public void testItValidatesElementWithBeforeHookAndItBlockInBetween() {
+        doQuickFixTest("ItValidatesElementWithBeforeHookAndItBlockInBetween", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesElementWithBeforeHookAndDescribeBlockInBetween() {
+        doQuickFixTest("ItValidatesElementWithBeforeHookAndDescribeBlockInBetween", TerraBundle.inspection("replace.terra.it.simple"));
+    }
+
+    public void testItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged() {
+        doQuickFixTest("ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged", TerraBundle.inspection("replace.terra.it.before.unchanged"));
+    }
+
+    public void testItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged() {
+        doQuickFixTest("ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged", TerraBundle.inspection("replace.terra.it.before.merged"));
+    }
+
+    public void testItValidatesesWithBeforeHookUnchanged() {
+        doQuickFixTest("ItValidatesesWithImmediateBeforeHook", TerraBundle.inspection("replace.terra.it.before.merged"));
+    }
+
+    public void testItValidatesesWithBeforeHookMerged() {
+        doQuickFixTest("ItValidatesesWithImmediateBeforeHookUnchanged", TerraBundle.inspection("replace.terra.it.before.unchanged"));
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewActionTest.java b/src/test/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewActionTest.java
index 164cd9d..4aba13b 100644
--- a/src/test/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewActionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/projectview/action/NavigateToScreenshotUsageProjectViewActionTest.java
@@ -26,12 +26,13 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.testFramework.TestActionEvent;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link NavigateToScreenshotUsageProjectViewAction}.
  */
-public class NavigateToScreenshotUsageProjectViewActionTest extends BasePlatformTestCase {
+public class NavigateToScreenshotUsageProjectViewActionTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolverTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolverTest.java
new file mode 100644
index 0000000..6924d5e
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/TerraFunctionalTestingScreenshotNameResolverTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+
+import com.intellij.lang.javascript.JavaScriptFileType;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+/**
+ * Unit test for {@link TerraFunctionalTestingScreenshotNameResolver}.
+ */
+public class TerraFunctionalTestingScreenshotNameResolverTest extends BasePlatformTestCase {
+
+    //resolveName
+
+    public void testResolveName() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('terra screenshot<caret>', { selector: '#selector' });");
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot.png");
+    }
+
+    public void testResolveEmptyNameAsEmptyString() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('<caret>', { selector: '#selector' });");
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(element)).isEmpty();
+    }
+
+    public void testResolveMissingNameAsEmptyString() {
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(null)).isEmpty();
+    }
+
+    //resolveName with partial test id
+
+    public void testResolvePartialNameWithTestId() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('terra screenshot <caret>[test id]', { selector: '#selector' });");
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(element)).isEqualTo("test_id.png");
+    }
+
+    public void testResolvePartialNameWithMultipleTestIds() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('terra screenshot <caret>[test id] and another [testid]', { selector: '#selector' });");
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(element)).isEqualTo("test_id]_and_another_[testid.png");
+    }
+
+    public void testResolveFullNameWithNonMatchingPartialTestId() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('terra screenshot <caret>[tes)t id]', { selector: '#selector' });");
+        assertThat(new TerraFunctionalTestingScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot_[tes)t_id].png");
+    }
+
+    //resolveDefaultName
+
+    public void testThrowsUnsupportedOperationExceptionForResolvingWithDefaultName() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "Terra.validates.element('with name<caret>', { selector: '#selector' });");
+
+        assertThatExceptionOfType(UnsupportedOperationException.class)
+            .isThrownBy(() -> new TerraFunctionalTestingScreenshotNameResolver().resolveDefaultName(element));
+    }
+
+    //Helper methods
+
+    private JSLiteralExpression configureFileForJSLiteralExpression(String text) {
+        myFixture.configureByText(JavaScriptFileType.INSTANCE, text);
+        return (JSLiteralExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollectorTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollectorTest.java
index b50d996..38d3737 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollectorTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotCollectorTest.java
@@ -24,12 +24,13 @@
 import com.intellij.lang.javascript.psi.JSReferenceExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraScreenshotCollector}.
  */
-public class TerraScreenshotCollectorTest extends BasePlatformTestCase {
+public class TerraScreenshotCollectorTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
@@ -75,6 +76,24 @@ public void testCollectBasedOnEmptyTerraNameParameter() {
         assertThat(((PsiFile) results[0]).getVirtualFile().getPath()).contains("__snapshots__/reference");
     }
 
+    public void testReturnsNoScreenshotForNullSourceElement() {
+        assertThat(new TerraScreenshotCollector(getProject()).collectFor(null)).isEmpty();
+    }
+
+    public void testReturnsNoScreenshotForEmptyScreenshotName() {
+        myFixture.copyFileToProject("package.json");
+        myFixture.configureByText("Collect-spec.js",
+            "describe('terra screenshot', () => {\n" +
+                "    it('Test case', () => {\n" +
+                "        Terra.validates.screenshot(<caret>'', { selector: '#selector' });\n" +
+                "    });\n" +
+                "});");
+
+        JSLiteralExpression element = (JSLiteralExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+
+        assertThat(new TerraScreenshotCollector(getProject()).collectFor(element)).isEmpty();
+    }
+
     //Helper methods
 
     private void configureSpecFile(String fileName) {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolverTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolverTest.java
deleted file mode 100644
index e2401be..0000000
--- a/src/test/java/com/picimako/terra/wdio/screenshot/TerraScreenshotNameResolverTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2021 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.picimako.terra.wdio.screenshot;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.intellij.lang.javascript.psi.JSExpression;
-import com.intellij.lang.javascript.psi.JSLiteralExpression;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-
-/**
- * Unit test for {@link TerraScreenshotNameResolver}.
- */
-public class TerraScreenshotNameResolverTest extends BasePlatformTestCase {
-
-    @Override
-    protected String getTestDataPath() {
-        return "testdata/terra/projectroot";
-    }
-
-    //resolveName
-
-    public void testResolveName() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[with_name].png");
-    }
-
-    public void testResolveNameToEmptyStringIfNoParentDescribeCall() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveNameNoParentDescribe-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEmpty();
-    }
-
-    public void testResolveNameToEmptyStringIfParentDescribeCallHasNoNameParameter() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveNameNoParentDescribeName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEmpty();
-    }
-
-    //resolveName with partial test id
-
-    public void testDefaultScreenshotPartialNameWithTestId() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveDefaultNameWithTestId-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[default].png");
-    }
-
-    public void testResolvePartialNameWithTestId() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveNameWithTestId-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[test_id].png");
-    }
-
-    public void testResolvePartialNameWithMultipleTestIds() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveNameWithMultipleTestIds-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[test_id]_and_another_[testid].png");
-    }
-
-    public void testResolveFullNameWithNonMatchingPartialTestId() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveNameWithNonMatchingTestId-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[with_name_[tes)t_id]].png");
-    }
-
-    //resolveDefaultName
-
-    public void testResolveDefaultName() {
-        JSExpression element = configureFileForJSExpression("tests/wdio/nameResolution/resolveDefaultName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveDefaultName(element)).isEqualTo("terra_screenshot[default].png");
-    }
-
-    public void testResolveDefaultNameForNonDefaultValidation() {
-        JSExpression element = configureFileForJSExpression("tests/wdio/nameResolution/resolveDefaultNameForNonDefaultValidation-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveDefaultName(element)).isEqualTo("terra_screenshot[default].png");
-    }
-
-    public void testResolveDefaultNameToEmptyStringIfNoParentDescribeCall() {
-        JSExpression element = configureFileForJSExpression("tests/wdio/nameResolution/resolveDefaultNameNoParentDescribe-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveDefaultName(element)).isEmpty();
-    }
-
-    public void testResolveDefaultNameToEmptyStringIfParentDescribeCallHasNoNameParameter() {
-        JSExpression element = configureFileForJSExpression("tests/wdio/nameResolution/resolveDefaultNameNoParentDescribeName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveDefaultName(element)).isEmpty();
-    }
-
-    //resolveWithFallback
-
-    public void testResolveByLiteralNoFallback() {
-        JSLiteralExpression element = configureFileForJSLiteralExpression("tests/wdio/nameResolution/resolveName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveWithFallback(element, null)).isEqualTo("terra_screenshot[with_name].png");
-    }
-
-    public void testResolveByMethodExpressionFallback() {
-        JSExpression element = configureFileForJSExpression("tests/wdio/nameResolution/resolveDefaultName-spec.js");
-        assertThat(new TerraScreenshotNameResolver().resolveWithFallback(null, element)).isEqualTo("terra_screenshot[default].png");
-    }
-
-    //Helper methods
-
-    private JSExpression configureFileForJSExpression(String path) {
-        myFixture.configureByFile(path);
-        return (JSExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
-    }
-
-    private JSLiteralExpression configureFileForJSLiteralExpression(String path) {
-        myFixture.configureByFile(path);
-        return (JSLiteralExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
-    }
-}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolverTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolverTest.java
new file mode 100644
index 0000000..073be3a
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/TerraToolkitScreenshotNameResolverTest.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.intellij.lang.javascript.JavaScriptFileType;
+import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+/**
+ * Unit test for {@link TerraToolkitScreenshotNameResolver}.
+ */
+public class TerraToolkitScreenshotNameResolverTest extends BasePlatformTestCase {
+
+    //resolveName
+
+    public void testResolveName() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with name<caret>', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[with_name].png");
+    }
+
+    public void testResolveNameToEmptyStringIfNoParentDescribeCall() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "{\n" +
+            "    Terra.it.matchesScreenshot('with name<caret>', { selector: '#selector' });\n" +
+            "}");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEmpty();
+    }
+
+    public void testResolveNameToEmptyStringIfParentDescribeCallHasNoNameParameter() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe(() => {\n" +
+            "        Terra.it.matchesScreenshot('with name<caret>', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEmpty();
+    }
+
+    //resolveName with partial test id
+
+    public void testDefaultScreenshotPartialNameWithTestId() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with name <caret>[default]', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[default].png");
+    }
+
+    public void testResolvePartialNameWithTestId() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with name <caret>[test id]', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[test_id].png");
+    }
+
+    public void testResolvePartialNameWithMultipleTestIds() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with <caret>[test id] and another [testid]', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[test_id]_and_another_[testid].png");
+    }
+
+    public void testResolveFullNameWithNonMatchingPartialTestId() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with name <caret>[tes)t id]', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveName(element)).isEqualTo("terra_screenshot[with_name_[tes)t_id]].png");
+    }
+
+    //resolveDefaultName
+
+    public void testResolveDefaultName() {
+        JSExpression element = configureFileForJSExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreen<caret>shot({ selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveDefaultName(element)).isEqualTo("terra_screenshot[default].png");
+    }
+
+    public void testResolveDefaultNameForNonDefaultValidation() {
+        JSExpression element = configureFileForJSExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreen<caret>shot('default', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveDefaultName(element)).isEqualTo("terra_screenshot[default].png");
+    }
+
+    public void testResolveDefaultNameToEmptyStringIfNoParentDescribeCall() {
+        JSExpression element = configureFileForJSExpression(
+            "{\n" +
+            "    Terra.it.matchesScreen<caret>shot({ selector: '#selector' });\n" +
+            "}\n");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveDefaultName(element)).isEmpty();
+    }
+
+    public void testResolveDefaultNameToEmptyStringIfParentDescribeCallHasNoNameParameter() {
+        JSExpression element = configureFileForJSExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe(() => {\n" +
+            "        Terra.it.matchesScreen<caret>shot({ selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveDefaultName(element)).isEmpty();
+    }
+
+    //resolveWithFallback
+
+    public void testResolveByLiteralNoFallback() {
+        JSLiteralExpression element = configureFileForJSLiteralExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreenshot('with name<caret>', { selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveWithFallback(element, null)).isEqualTo("terra_screenshot[with_name].png");
+    }
+
+    public void testResolveByMethodExpressionFallback() {
+        JSExpression element = configureFileForJSExpression(
+            "describe('outer describe', () => {\n" +
+            "    describe('terra screenshot', () => {\n" +
+            "        Terra.it.matchesScreen<caret>shot({ selector: '#selector' });\n" +
+            "    });\n" +
+            "});");
+        assertThat(new TerraToolkitScreenshotNameResolver().resolveWithFallback(null, element)).isEqualTo("terra_screenshot[default].png");
+    }
+
+    //Helper methods
+
+    private JSExpression configureFileForJSExpression(String text) {
+        myFixture.configureByText(JavaScriptFileType.INSTANCE, text);
+        return (JSExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+    }
+
+    private JSLiteralExpression configureFileForJSLiteralExpression(String text) {
+        myFixture.configureByText(JavaScriptFileType.INSTANCE, text);
+        return (JSLiteralExpression) myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProviderTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProviderTest.java
index 7f99613..fda8afd 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProviderTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/gutter/TerraScreenshotValidationLineMarkerProviderTest.java
@@ -26,12 +26,13 @@
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraScreenshotValidationLineMarkerProvider}.
  */
-public class TerraScreenshotValidationLineMarkerProviderTest extends BasePlatformTestCase {
+public class TerraScreenshotValidationLineMarkerProviderTest extends TerraToolkitTestCase {
 
     private final TerraScreenshotValidationLineMarkerProvider provider = new TerraScreenshotValidationLineMarkerProvider();
 
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderNoGlobalSelectorTest.kt b/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderNoGlobalSelectorTest.kt
index 67cf99b..77d3163 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderNoGlobalSelectorTest.kt
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderNoGlobalSelectorTest.kt
@@ -17,6 +17,8 @@
 package com.picimako.terra.wdio.screenshot.inlayhint
 
 import com.intellij.testFramework.utils.inlays.InlayHintsProviderTestCase
+import com.picimako.terra.wdio.TerraResourceManager
+import com.picimako.terra.wdio.TerraToolkitManager
 import com.picimako.terra.wdio.screenshot.inlayhint.TerraScreenshotInlayHintsProvider.InlayType.Inline
 
 /**
@@ -30,6 +32,7 @@ class TerraScreenshotInlayHintsProviderNoGlobalSelectorTest : InlayHintsProvider
 
     override fun setUp() {
         super.setUp()
+        TerraResourceManager.getInstance(project, TerraToolkitManager::class.java)
         myFixture.copyFileToProject("wdio.conf.js")
     }
 
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderTest.kt b/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderTest.kt
index eea589a..e93f187 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderTest.kt
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inlayhint/TerraScreenshotInlayHintsProviderTest.kt
@@ -17,6 +17,8 @@
 package com.picimako.terra.wdio.screenshot.inlayhint
 
 import com.intellij.testFramework.utils.inlays.InlayHintsProviderTestCase
+import com.picimako.terra.wdio.TerraResourceManager
+import com.picimako.terra.wdio.TerraToolkitManager
 import com.picimako.terra.wdio.screenshot.inlayhint.TerraScreenshotInlayHintsProvider.InlayType.Block
 import com.picimako.terra.wdio.screenshot.inlayhint.TerraScreenshotInlayHintsProvider.InlayType.Inline
 
@@ -31,6 +33,7 @@ class TerraScreenshotInlayHintsProviderTest : InlayHintsProviderTestCase() {
 
     override fun setUp() {
         super.setUp()
+        TerraResourceManager.getInstance(project, TerraToolkitManager::class.java)
         myFixture.copyFileToProject("wdio.conf.js")
     }
 
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspectionTest.java
new file mode 100644
index 0000000..e571953
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/DuplicateScreenshotNameInspectionTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+
+/**
+ * Unit test for {@link DuplicateScreenshotNameInspection}.
+ */
+public class DuplicateScreenshotNameInspectionTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new DuplicateScreenshotNameInspection();
+    }
+
+    public void testDuplicateScreenshotName() {
+        myFixture.copyFileToProject("package.json");
+        doWdioSpecTest();
+    }
+
+    public void testTriplicateScreenshotName() {
+        myFixture.copyFileToProject("package.json");
+        doWdioSpecTest();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspectionTest.java
index bd0922d..26fadc6 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/GlobalTerraSelectorInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link GlobalTerraSelectorInspection}.
  */
-public class GlobalTerraSelectorInspectionTest extends TerraInspectionBaseTestCase {
+public class GlobalTerraSelectorInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraFTValidationPropertiesInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraFTValidationPropertiesInspectionTest.java
new file mode 100644
index 0000000..e47cb3a
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraFTValidationPropertiesInspectionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+
+/**
+ * Unit test for {@link InvalidTerraValidationPropertiesInspection}.
+ */
+public class InvalidTerraFTValidationPropertiesInspectionTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new InvalidTerraValidationPropertiesInspection();
+    }
+
+    public void testInvalidTerraValidationPropertiesTerraFunctionalTesting() {
+        doWdioSpecTest();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraToolkitValidationPropertiesInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraToolkitValidationPropertiesInspectionTest.java
new file mode 100644
index 0000000..78dbcc5
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/InvalidTerraToolkitValidationPropertiesInspectionTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
+
+/**
+ * Unit test for {@link InvalidTerraValidationPropertiesInspection}.
+ */
+public class InvalidTerraToolkitValidationPropertiesInspectionTest extends TerraToolkitInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new InvalidTerraValidationPropertiesInspection();
+    }
+
+    public void testInvalidTerraValidationProperties() {
+        doWdioSpecTest();
+    }
+
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspectionTest.java
index bef2b4b..188836e 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotInspectionTest.java
@@ -23,12 +23,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link MissingScreenshotInspection}.
  */
-public class MissingScreenshotInspectionTest extends TerraInspectionBaseTestCase {
+public class MissingScreenshotInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspectionTest.java
new file mode 100644
index 0000000..20c5d98
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/MissingScreenshotNameInspectionTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.inspection;
+
+import com.intellij.codeInspection.InspectionProfileEntry;
+import org.jetbrains.annotations.Nullable;
+
+import com.picimako.terra.wdio.TerraFunctionalTestingInspectionTestCase;
+
+/**
+ * Unit test for {@link MissingScreenshotNameInspection}.
+ */
+public class MissingScreenshotNameInspectionTest extends TerraFunctionalTestingInspectionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return BASE_PATH + "/wdio/screenshot";
+    }
+
+    @Override
+    protected @Nullable InspectionProfileEntry getInspection() {
+        return new MissingScreenshotNameInspection();
+    }
+
+    public void testMandatoryNameParameter() {
+        doWdioSpecTest();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceAboveThresholdInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceAboveThresholdInspectionTest.java
index db56edc..04f894a 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceAboveThresholdInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/ScreenshotMismatchToleranceAboveThresholdInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link ScreenshotMismatchToleranceInspection}.
  */
-public class ScreenshotMismatchToleranceAboveThresholdInspectionTest extends TerraInspectionBaseTestCase {
+public class ScreenshotMismatchToleranceAboveThresholdInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspectionTest.java
index c448040..f4e5b8c 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/TerraElementValidationIsPreferredOverScreenshotInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link TerraElementValidationIsPreferredOverScreenshotInspection}.
  */
-public class TerraElementValidationIsPreferredOverScreenshotInspectionTest extends TerraInspectionBaseTestCase {
+public class TerraElementValidationIsPreferredOverScreenshotInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchHasNonNumericValueInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchHasNonNumericValueInspectionTest.java
index 1408881..bd1beee 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchHasNonNumericValueInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchHasNonNumericValueInspectionTest.java
@@ -19,13 +19,13 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 import com.picimako.terra.wdio.screenshot.inspection.ScreenshotMismatchToleranceBlockingInspection;
 
 /**
  * Unit test for {@link ScreenshotMismatchToleranceBlockingInspection}.
  */
-public class ScreenshotMismatchHasNonNumericValueInspectionTest extends TerraInspectionBaseTestCase {
+public class ScreenshotMismatchHasNonNumericValueInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchOutsideOfBoundariesInspectionTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchOutsideOfBoundariesInspectionTest.java
index dfaede9..9721567 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchOutsideOfBoundariesInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/inspection/blocking/ScreenshotMismatchOutsideOfBoundariesInspectionTest.java
@@ -19,13 +19,13 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 import com.picimako.terra.wdio.screenshot.inspection.ScreenshotMismatchToleranceBlockingInspection;
 
 /**
  * Unit test for {@link ScreenshotMismatchToleranceBlockingInspection}.
  */
-public class ScreenshotMismatchOutsideOfBoundariesInspectionTest extends TerraInspectionBaseTestCase {
+public class ScreenshotMismatchOutsideOfBoundariesInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotCollectorFunctionalTestingTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotCollectorFunctionalTestingTest.java
new file mode 100644
index 0000000..96541a4
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotCollectorFunctionalTestingTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.screenshot.reference;
+
+import static com.picimako.terra.wdio.ScreenshotTypeHelper.latest;
+import static com.picimako.terra.wdio.ScreenshotTypeHelper.reference;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.intellij.lang.javascript.psi.JSLiteralExpression;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.LightProjectDescriptor;
+
+import com.picimako.terra.TerraFunctionalTestingTestCase;
+import com.picimako.terra.wdio.screenshot.TerraScreenshotCollector;
+
+/**
+ * Unit test for {@link TerraScreenshotCollector}.
+ */
+public class TerraScreenshotCollectorFunctionalTestingTest extends TerraFunctionalTestingTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "testdata/terra/functestroot";
+    }
+
+    public void testCollectBasedOnTerraNameParameter() {
+        configureFiles();
+
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+        PsiElement[] results = new TerraScreenshotCollector(getProject()).collectFor((JSLiteralExpression) element);
+
+        assertThat(results).hasSize(2);
+        assertThat(((PsiFile) results[0]).getVirtualFile().getPath()).contains("__snapshots__/reference");
+        assertThat(((PsiFile) results[1]).getVirtualFile().getPath()).contains("__snapshots__/reference");
+    }
+
+    public void testCollectBasedOnTerraNameParameterAsPsiFiles() {
+        configureFiles();
+
+        PsiElement element = myFixture.getFile().findElementAt(myFixture.getCaretOffset()).getParent();
+        PsiElement[] results = new TerraScreenshotCollector(getProject()).collectAsPsiFilesFor((JSLiteralExpression) element);
+
+        assertThat(results).hasSize(2);
+        assertThat(((PsiFile) results[0]).getVirtualFile().getPath()).contains("__snapshots__/reference");
+        assertThat(((PsiFile) results[1]).getVirtualFile().getPath()).contains("__snapshots__/reference");
+    }
+
+    private void configureFiles() {
+        myFixture.configureByFile("tests/wdio/CollectScreenshots-spec.js");
+        myFixture.copyFileToProject("package.json");
+
+        myFixture.copyFileToProject(reference("/terra-default-theme/en/chrome_huge/FindUnusedScreenshot-spec/terra_screenshot.png"));
+        myFixture.copyFileToProject(reference("/terra-default-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png"));
+        myFixture.copyFileToProject(reference("/clinical-lowlight-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png"));
+        myFixture.copyFileToProject(latest("/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png"));
+    }
+
+    //To fix the test failure when copying package.json to the project
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceTest.java b/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceTest.java
index 948d313..3ad4b2a 100644
--- a/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceTest.java
+++ b/src/test/java/com/picimako/terra/wdio/screenshot/reference/TerraScreenshotReferenceTest.java
@@ -26,12 +26,13 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiPolyVariantReference;
 import com.intellij.psi.ResolveResult;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
 
 /**
  * Unit test for {@link TerraScreenshotReference}.
  */
-public class TerraScreenshotReferenceTest extends BasePlatformTestCase {
+public class TerraScreenshotReferenceTest extends TerraToolkitTestCase {
 
     private static final Set<String> LOCATION_STRINGS = Set.of("en/chrome/huge", "en/chrome/medium");
 
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsActionTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsActionTest.java
index 4232393..7c7ade4 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsActionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/FindUnusedScreenshotsActionTest.java
@@ -22,12 +22,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.intellij.testFramework.TestActionEvent;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.TerraToolkitTestCase;
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * Unit test for {@link FindUnusedScreenshotsAction}.
  */
-public class FindUnusedScreenshotsActionTest extends BasePlatformTestCase {
+public class FindUnusedScreenshotsActionTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
@@ -47,10 +52,10 @@ public void testMarksScreenshotsUnused() {
 
         TerraWdioTreeModel treeModel = new TerraWdioTreeModel(getProject());
         TerraWdioTree tree = new TerraWdioTree(treeModel);
-        FindUnusedScreenshotsAction action = new FindUnusedScreenshotsAction(tree);
+        FindUnusedScreenshotsAction action = new FindUnusedScreenshotsAction(tree, getProject());
 
-        TerraWdioTreeSpecNode relatedFindUnusedScreenshotSpec = ((TerraWdioTreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
-        assertThat(relatedFindUnusedScreenshotSpec.getScreenshots().stream().noneMatch(TerraWdioTreeScreenshotNode::isUnused)).isTrue();
+        TreeSpecNode relatedFindUnusedScreenshotSpec = ((TreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
+        assertThat(relatedFindUnusedScreenshotSpec.getScreenshots().stream().noneMatch(TreeScreenshotNode::isUnused)).isTrue();
 
         action.actionPerformed(new TestActionEvent());
 
@@ -71,10 +76,10 @@ public void testUnrelatedIsUnused() {
 
         TerraWdioTreeModel treeModel = new TerraWdioTreeModel(getProject());
         TerraWdioTree tree = new TerraWdioTree(treeModel);
-        FindUnusedScreenshotsAction action = new FindUnusedScreenshotsAction(tree);
+        FindUnusedScreenshotsAction action = new FindUnusedScreenshotsAction(tree, getProject());
 
-        TerraWdioTreeSpecNode nonRelatedSomeSpec = ((TerraWdioTreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
-        assertThat(nonRelatedSomeSpec.getScreenshots().stream().noneMatch(TerraWdioTreeScreenshotNode::isUnused)).isTrue();
+        TreeSpecNode nonRelatedSomeSpec = ((TreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
+        assertThat(nonRelatedSomeSpec.getScreenshots().stream().noneMatch(TreeScreenshotNode::isUnused)).isTrue();
 
         action.actionPerformed(new TestActionEvent());
 
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListenerTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListenerTest.java
index 4605c09..6a3c541 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListenerTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioExternalFileAndFolderChangeListenerTest.java
@@ -42,6 +42,7 @@
 import com.picimako.terra.wdio.toolwindow.action.DeleteScreenshotsAction;
 import com.picimako.terra.wdio.toolwindow.action.RenameScreenshotsAction;
 import com.picimako.terra.wdio.toolwindow.action.ReplaceReferenceWithLatestAction;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
 
 /**
  * Unit test for {@link TerraWdioExternalFileAndFolderChangeListener}.
diff --git a/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationServiceTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryNegativeTest.java
similarity index 53%
rename from src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationServiceTest.java
rename to src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryNegativeTest.java
index 09b7635..ab28be0 100644
--- a/src/test/java/com/picimako/terra/documentation/TerraWdioDocumentationServiceTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryNegativeTest.java
@@ -14,21 +14,23 @@
  * limitations under the License.
  */
 
-package com.picimako.terra.documentation;
+package com.picimako.terra.wdio.toolwindow;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Test;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.TerraToolkitManager;
 
 /**
- * Unit test for {@link TerraWdioDocumentationService}.
+ * Unit test for {@link TerraWdioToolWindowFactory}.
  */
-public class TerraWdioDocumentationServiceTest {
+public class TerraWdioToolWindowFactoryNegativeTest extends BasePlatformTestCase {
 
-    @Test
-    public void shouldLoadDocumentationProperties() {
-        TerraWdioDocumentationService service = new TerraWdioDocumentationService();
+    public void testNotAvailableForNonExistentWdioRoot() {
+        TerraResourceManager.getInstance(getProject(), TerraToolkitManager.class);
 
-        assertThat(service.getDocs().getProperty("Terra.validates")).isEqualTo("{terra} / Test Assertion Helpers|{wdioutil}#test-assertion-helpers");
+        assertThat(new TerraWdioToolWindowFactory().shouldBeAvailable(getProject())).isFalse();
     }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryTest.java
index 0e62882..12204ee 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioToolWindowFactoryTest.java
@@ -17,79 +17,38 @@
 package com.picimako.terra.wdio.toolwindow;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.when;
 
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import com.intellij.testFramework.LightProjectDescriptor;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import com.picimako.terra.wdio.TerraResourceManager;
+import com.picimako.terra.wdio.TerraToolkitManager;
 import com.picimako.terra.wdio.TerraWdioFolders;
 
 /**
  * Unit test for {@link TerraWdioToolWindowFactory}.
  */
-@RunWith(MockitoJUnitRunner.class)
-public class TerraWdioToolWindowFactoryTest {
+public class TerraWdioToolWindowFactoryTest extends BasePlatformTestCase {
 
-    @Mock
-    private Project project;
-
-    @Test
-    public void shouldNotBeAvailableForDefaultProject() {
-        when(project.isDefault()).thenReturn(true);
-
-        TerraWdioToolWindowFactory factory = new TerraWdioToolWindowFactory();
-
-        assertThat(factory.shouldBeAvailable(project)).isFalse();
+    @Override
+    protected String getTestDataPath() {
+        return "testdata/terra/projectroot";
     }
 
-    @Test
-    public void shouldNotBeAvailableForNullWdioRoot() {
-        when(project.isDefault()).thenReturn(false);
-        try (MockedStatic<TerraWdioFolders> wdioFolders = Mockito.mockStatic(TerraWdioFolders.class)) {
-            wdioFolders.when(() -> TerraWdioFolders.projectWdioRoot(project)).thenReturn(null);
-
-            TerraWdioToolWindowFactory factory = new TerraWdioToolWindowFactory();
-
-            assertThat(factory.shouldBeAvailable(project)).isFalse();
-        }
+    public void testNotAvailableWhenNotUsingTerra() {
+        assertThat(new TerraWdioToolWindowFactory().shouldBeAvailable(getProject())).isFalse();
     }
 
-    @Test
-    public void shouldNotBeAvailableForNonExistentWdioRoot() {
-        when(project.isDefault()).thenReturn(false);
-        try (MockedStatic<TerraWdioFolders> wdioFolders = Mockito.mockStatic(TerraWdioFolders.class)) {
-            VirtualFile wdioRoot = mock(VirtualFile.class);
-            when(wdioRoot.exists()).thenReturn(false);
-            wdioFolders.when(() -> TerraWdioFolders.projectWdioRoot(project)).thenReturn(wdioRoot);
-
-            TerraWdioToolWindowFactory factory = new TerraWdioToolWindowFactory();
+    public void testAvailableAndShouldConfigureWdioTestRootPath() {
+        TerraResourceManager.getInstance(getProject(), TerraToolkitManager.class);
+        myFixture.copyFileToProject("tests/wdio/CollectScreenshots-spec.js");
 
-            assertThat(factory.shouldBeAvailable(project)).isFalse();
-        }
+        assertThat(new TerraWdioToolWindowFactory().shouldBeAvailable(getProject())).isTrue();
+        assertThat(TerraWdioFolders.getWdioTestRootPath()).isEqualTo("/src/tests/wdio");
     }
 
-    @Test
-    public void shouldBeAvailableAndShouldConfigureWdioTestRootPath() {
-        when(project.isDefault()).thenReturn(false);
-        when(project.getBasePath()).thenReturn("/home/project");
-        try (MockedStatic<TerraWdioFolders> wdioFolders = Mockito.mockStatic(TerraWdioFolders.class)) {
-            VirtualFile wdioRoot = mock(VirtualFile.class);
-            when(wdioRoot.exists()).thenReturn(true);
-            when(wdioRoot.getPath()).thenReturn("/home/project/tests/wdio");
-            wdioFolders.when(() -> TerraWdioFolders.projectWdioRoot(project)).thenReturn(wdioRoot);
-
-            TerraWdioToolWindowFactory factory = new TerraWdioToolWindowFactory();
-            assertThat(factory.shouldBeAvailable(project)).isTrue();
-
-            wdioFolders.verify(times(1), () -> TerraWdioFolders.setWdioTestRootPath("/tests/wdio"));
-        }
+    @Override
+    protected LightProjectDescriptor getProjectDescriptor() {
+        return new LightProjectDescriptor();
     }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRendererTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRendererTest.java
deleted file mode 100644
index 42cee39..0000000
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeCellRendererTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.picimako.terra.wdio.toolwindow;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import java.awt.*;
-import javax.swing.*;
-
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
-
-/**
- * Unit test for {@link TerraWdioTreeCellRenderer}.
- */
-public class TerraWdioTreeCellRendererTest extends BasePlatformTestCase {
-
-    private TerraWdioTreeCellRenderer renderer;
-    private TerraWdioTree tree;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        TerraWdioTreeModel treeModel = new TerraWdioTreeModel(getProject());
-        tree = new TerraWdioTree(treeModel);
-        renderer = new TerraWdioTreeCellRenderer();
-        renderer.setFont(new Font("font", Font.ITALIC, 14));
-        ScreenshotStatisticsProjectService.getInstance(getProject()).isShowStatistics = true;
-    }
-
-    public void testSetFontAndTextForModelDataRoot() {
-        TerraWdioTreeModelDataRoot dataRoot = new TerraWdioTreeModelDataRoot("root", getProject());
-
-        validateComponent(getComponent(tree, dataRoot), new Font("font", Font.PLAIN, 14), "root (0 specs, 0 screenshots)");
-    }
-
-    public void testSetFontAndTextForSpecNode() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-
-        validateComponent(getComponent(tree, spec), new Font("font", Font.PLAIN, 14), "spec");
-    }
-
-    public void testMarkSpecNodeAsDiff() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
-        screenshot.addDiff(mock(VirtualFile.class));
-        spec.addScreenshot(screenshot);
-
-        validateComponent(getComponent(tree, spec), new Font("font", Font.BOLD, 14), "spec (1)");
-    }
-
-    public void testSetFontAndTextForScreenshotNode() {
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
-
-        validateComponent(getComponent(tree, screenshot), new Font("font", Font.PLAIN, 14), "screenshot (0)");
-    }
-
-    public void testScreenshotNodeAsDiff() {
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
-        screenshot.addDiff(mock(VirtualFile.class));
-
-        validateComponent(getComponent(tree, screenshot), new Font("font", Font.BOLD, 14), "screenshot (0)");
-    }
-
-    private JLabel getComponent(JTree tree, TerraWdioTreeNode node) {
-        return (JLabel) renderer.getTreeCellRendererComponent(tree, node, false, false, false, 1, false);
-    }
-
-    private void validateComponent(JLabel component, Font font, String text) {
-        assertThat(component.getFont()).isEqualTo(font);
-        assertThat(component.getText()).isEqualTo(text);
-    }
-}
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeRendererTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeRendererTest.java
new file mode 100644
index 0000000..5f7d27f
--- /dev/null
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeRendererTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2020 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.picimako.terra.wdio.toolwindow;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import java.awt.*;
+import javax.swing.*;
+
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.testFramework.fixtures.BasePlatformTestCase;
+
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
+
+/**
+ * Unit test for {@link TerraWdioTree.TerraWdioNodeRenderer}.
+ */
+public class TerraWdioTreeNodeRendererTest extends BasePlatformTestCase {
+
+    private TerraWdioTree.TerraWdioNodeRenderer renderer;
+    private TerraWdioTree tree;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        TerraWdioTreeModel treeModel = new TerraWdioTreeModel(getProject());
+        tree = new TerraWdioTree(treeModel);
+        renderer = new TerraWdioTree.TerraWdioNodeRenderer();
+        renderer.setFont(new Font("font", Font.ITALIC, 14));
+        ScreenshotStatisticsProjectService.getInstance(getProject()).isShowStatistics = true;
+    }
+
+    public void testSetFontAndTextForModelDataRoot() {
+        TreeModelDataRoot dataRoot = new TreeModelDataRoot("root", getProject());
+
+        customizeComponent(tree, dataRoot);
+        validateComponent(new Font("font", Font.PLAIN, 14), "Wdio Resources (0 specs, 0 screenshots)");
+    }
+
+    public void testSetFontAndTextForSpecNode() {
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+
+        customizeComponent(tree, spec);
+        validateComponent(new Font("font", Font.PLAIN, 14), "spec");
+    }
+
+    public void testMarkSpecNodeAsDiff() {
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
+        screenshot.addDiff(mock(VirtualFile.class));
+        spec.addScreenshot(screenshot);
+
+        customizeComponent(tree, spec);
+        validateComponent(new Font("font", Font.BOLD, 14), "spec (1)");
+    }
+
+    public void testSetFontAndTextForScreenshotNode() {
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
+
+        customizeComponent(tree, screenshot);
+        validateComponent(new Font("font", Font.PLAIN, 14), "screenshot (0)");
+    }
+
+    public void testScreenshotNodeAsDiff() {
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
+        screenshot.addDiff(mock(VirtualFile.class));
+
+        customizeComponent(tree, screenshot);
+        validateComponent(new Font("font", Font.BOLD, 14), "screenshot (0)");
+    }
+
+    private void customizeComponent(JTree tree, TerraWdioTreeNode node) {
+        renderer.customizeCellRenderer(tree, node, false, false, false, 1, false);
+    }
+
+    private void validateComponent(Font font, String text) {
+        assertThat(renderer.getFont()).isEqualTo(font);
+        assertThat(renderer.getCharSequence(true)).isEqualTo(text);
+    }
+}
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeTest.java
index 4eaec97..18e1e2b 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeNodeTest.java
@@ -20,6 +20,11 @@
 
 import org.junit.Test;
 
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTreeNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
+
 /**
  * Unit test for {@link TerraWdioTreeNode}.
  */
@@ -27,28 +32,28 @@ public class TerraWdioTreeNodeTest {
 
     @Test
     public void shouldBeSpec() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", null);
+        TreeSpecNode spec = new TreeSpecNode("spec", null);
 
         assertThat(TerraWdioTreeNode.isSpec(spec)).isTrue();
     }
 
     @Test
     public void shouldNotBeSpec() {
-        TerraWdioTreeModelDataRoot root = new TerraWdioTreeModelDataRoot("root", null);
+        TreeModelDataRoot root = new TreeModelDataRoot("root", null);
 
         assertThat(TerraWdioTreeNode.isSpec(root)).isFalse();
     }
 
     @Test
     public void shouldBeScreenshot() {
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", null);
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", null);
 
         assertThat(TerraWdioTreeNode.isScreenshot(screenshot)).isTrue();
     }
 
     @Test
     public void shouldNotBeScreenshot() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", null);
+        TreeSpecNode spec = new TreeSpecNode("spec", null);
 
         assertThat(TerraWdioTreeNode.isScreenshot(spec)).isFalse();
     }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRootTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeModelDataRootTest.java
similarity index 53%
rename from src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRootTest.java
rename to src/test/java/com/picimako/terra/wdio/toolwindow/TreeModelDataRootTest.java
index 393d764..4cfadc3 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeModelDataRootTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeModelDataRootTest.java
@@ -22,65 +22,75 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
+
 /**
- * Unit test for {@link TerraWdioTreeModelDataRoot}.
+ * Unit test for {@link TreeModelDataRoot}.
  */
-public class TerraWdioTreeModelDataRootTest extends BasePlatformTestCase {
+public class TreeModelDataRootTest extends BasePlatformTestCase {
 
-    private TerraWdioTreeModelDataRoot root;
+    private TreeModelDataRoot root;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        root = new TerraWdioTreeModelDataRoot("Screenshots", getProject());
+        root = new TreeModelDataRoot("Screenshots", getProject());
         ScreenshotStatisticsProjectService.getInstance(getProject()).isShowStatistics = true;
     }
 
+    public void testReturnDisplayNameAsToStringForStatisticsTurnedOff() {
+        ScreenshotStatisticsProjectService.getInstance(getProject()).isShowStatistics = false;
+
+        assertThat(root).hasToString("Screenshots");
+    }
+
     public void testReturnToStringWithSingularSpecSingularScreenshotStat() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
         screenshot.addReference(mock(VirtualFile.class));
         spec.addScreenshot(screenshot);
         root.getSpecs().add(spec);
 
-        assertThat(root).hasToString("Screenshots (1 spec, 1 screenshot)");
+        assertThat(root).hasToString("Wdio Resources (1 spec, 1 screenshot)");
     }
 
     public void testReturnToStringWithSingularSpecPluralScreenshotStat() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
         screenshot.addReference(mock(VirtualFile.class));
         screenshot.addReference(mock(VirtualFile.class));
         spec.addScreenshot(screenshot);
         root.getSpecs().add(spec);
 
-        assertThat(root).hasToString("Screenshots (1 spec, 2 screenshots)");
+        assertThat(root).hasToString("Wdio Resources (1 spec, 2 screenshots)");
     }
 
     public void testReturnToStringWithPluralSpecSingularScreenshotStat() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-        TerraWdioTreeSpecNode spec2 = new TerraWdioTreeSpecNode("spec2", getProject());
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+        TreeSpecNode spec2 = new TreeSpecNode("spec2", getProject());
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
         screenshot.addReference(mock(VirtualFile.class));
         spec.addScreenshot(screenshot);
         root.getSpecs().add(spec);
         root.getSpecs().add(spec2);
 
-        assertThat(root).hasToString("Screenshots (2 specs, 1 screenshot)");
+        assertThat(root).hasToString("Wdio Resources (2 specs, 1 screenshot)");
     }
 
     public void testReturnToStringWithPluralSpecPluralScreenshotStat() {
-        TerraWdioTreeSpecNode spec = new TerraWdioTreeSpecNode("spec", getProject());
-        TerraWdioTreeSpecNode spec2 = new TerraWdioTreeSpecNode("spec2", getProject());
-        TerraWdioTreeScreenshotNode screenshot = new TerraWdioTreeScreenshotNode("screenshot", getProject());
+        TreeSpecNode spec = new TreeSpecNode("spec", getProject());
+        TreeSpecNode spec2 = new TreeSpecNode("spec2", getProject());
+        TreeScreenshotNode screenshot = new TreeScreenshotNode("screenshot", getProject());
         screenshot.addReference(mock(VirtualFile.class));
-        TerraWdioTreeScreenshotNode screenshot2 = new TerraWdioTreeScreenshotNode("screenshot", getProject());
+        TreeScreenshotNode screenshot2 = new TreeScreenshotNode("screenshot", getProject());
         screenshot2.addReference(mock(VirtualFile.class));
         spec.addScreenshot(screenshot);
         spec.addScreenshot(screenshot2);
         root.getSpecs().add(spec);
         root.getSpecs().add(spec2);
 
-        assertThat(root).hasToString("Screenshots (2 specs, 2 screenshots)");
+        assertThat(root).hasToString("Wdio Resources (2 specs, 2 screenshots)");
     }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNodeTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeScreenshotNodeTest.java
similarity index 72%
rename from src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNodeTest.java
rename to src/test/java/com/picimako/terra/wdio/toolwindow/TreeScreenshotNodeTest.java
index 75ad6f2..4596fc0 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeScreenshotNodeTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeScreenshotNodeTest.java
@@ -22,10 +22,12 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+
 /**
- * Unit test for {@link TerraWdioTreeScreenshotNode}.
+ * Unit test for {@link TreeScreenshotNode}.
  */
-public class TerraWdioTreeScreenshotNodeTest extends BasePlatformTestCase {
+public class TreeScreenshotNodeTest extends BasePlatformTestCase {
 
     @Override
     protected void setUp() throws Exception {
@@ -34,13 +36,13 @@ protected void setUp() throws Exception {
     }
 
     public void testReturnToStringWithZeroReferenceCount() {
-        TerraWdioTreeScreenshotNode screenshotNode = new TerraWdioTreeScreenshotNode("screenshot node", getProject());
+        TreeScreenshotNode screenshotNode = new TreeScreenshotNode("screenshot node", getProject());
 
         assertThat(screenshotNode).hasToString("screenshot node (0)");
     }
 
     public void testReturnToStringWithMoreThanZeroReferenceCount() {
-        TerraWdioTreeScreenshotNode screenshotNode = new TerraWdioTreeScreenshotNode("screenshot node", getProject());
+        TreeScreenshotNode screenshotNode = new TreeScreenshotNode("screenshot node", getProject());
 
         screenshotNode.addReference(mock(VirtualFile.class));
         screenshotNode.addReference(mock(VirtualFile.class));
@@ -49,27 +51,27 @@ public void testReturnToStringWithMoreThanZeroReferenceCount() {
     }
 
     public void testHaveLatest() {
-        TerraWdioTreeScreenshotNode node = new TerraWdioTreeScreenshotNode("dummy", null);
+        TreeScreenshotNode node = new TreeScreenshotNode("dummy", null);
         node.addLatest(mock(VirtualFile.class));
 
         assertThat(node.hasLatest()).isTrue();
     }
 
     public void testNotHaveLatest() {
-        TerraWdioTreeScreenshotNode node = new TerraWdioTreeScreenshotNode("dummy", null);
+        TreeScreenshotNode node = new TreeScreenshotNode("dummy", null);
 
         assertThat(node.hasLatest()).isFalse();
     }
 
     public void testHaveDiff() {
-        TerraWdioTreeScreenshotNode node = new TerraWdioTreeScreenshotNode("dummy", null);
+        TreeScreenshotNode node = new TreeScreenshotNode("dummy", null);
         node.addDiff(mock(VirtualFile.class));
 
         assertThat(node.hasDiff()).isTrue();
     }
 
     public void testNotHaveDiff() {
-        TerraWdioTreeScreenshotNode node = new TerraWdioTreeScreenshotNode("dummy", null);
+        TreeScreenshotNode node = new TreeScreenshotNode("dummy", null);
 
         assertThat(node.hasDiff()).isFalse();
     }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNodeTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeSpecNodeTest.java
similarity index 83%
rename from src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNodeTest.java
rename to src/test/java/com/picimako/terra/wdio/toolwindow/TreeSpecNodeTest.java
index 7b5ffd3..5ff4b2c 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/TerraWdioTreeSpecNodeTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/TreeSpecNodeTest.java
@@ -20,21 +20,24 @@
 
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
+
 /**
- * Unit test for {@link TerraWdioTreeSpecNode}.
+ * Unit test for {@link TreeSpecNode}.
  */
-public class TerraWdioTreeSpecNodeTest extends BasePlatformTestCase {
+public class TreeSpecNodeTest extends BasePlatformTestCase {
 
-    private TerraWdioTreeSpecNode specNode;
-    private TerraWdioTreeScreenshotNode screenshotNode1;
-    private TerraWdioTreeScreenshotNode screenshotNode2;
+    private TreeSpecNode specNode;
+    private TreeScreenshotNode screenshotNode1;
+    private TreeScreenshotNode screenshotNode2;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        specNode = new TerraWdioTreeSpecNode("spec node", getProject());
-        screenshotNode1 = new TerraWdioTreeScreenshotNode("screenshot node 1", getProject());
-        screenshotNode2 = new TerraWdioTreeScreenshotNode("node screenshot 2", getProject());
+        specNode = new TreeSpecNode("spec node", getProject());
+        screenshotNode1 = new TreeScreenshotNode("screenshot node 1", getProject());
+        screenshotNode2 = new TreeScreenshotNode("node screenshot 2", getProject());
 
         specNode.addScreenshot(screenshotNode1);
         specNode.addScreenshot(screenshotNode2);
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageActionTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageActionTest.java
index 695edcd..00841a1 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageActionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/action/NavigateToScreenshotUsageActionTest.java
@@ -28,18 +28,18 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.testFramework.TestActionEvent;
-import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 
-import com.picimako.terra.wdio.toolwindow.TerraWdioTree;
+import com.picimako.terra.TerraToolkitTestCase;
 import com.picimako.terra.wdio.toolwindow.TerraWdioTreeModel;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeModelDataRoot;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeScreenshotNode;
-import com.picimako.terra.wdio.toolwindow.TerraWdioTreeSpecNode;
+import com.picimako.terra.wdio.toolwindow.node.TerraWdioTree;
+import com.picimako.terra.wdio.toolwindow.node.TreeModelDataRoot;
+import com.picimako.terra.wdio.toolwindow.node.TreeScreenshotNode;
+import com.picimako.terra.wdio.toolwindow.node.TreeSpecNode;
 
 /**
  * Unit test for {@link NavigateToScreenshotUsageAction}.
  */
-public class NavigateToScreenshotUsageActionTest extends BasePlatformTestCase {
+public class NavigateToScreenshotUsageActionTest extends TerraToolkitTestCase {
 
     @Override
     protected String getTestDataPath() {
@@ -108,8 +108,8 @@ private TestActionEvent testActionEvent(PsiFile screenshot) {
     private TerraWdioTree wdioTree() {
         TerraWdioTreeModel treeModel = new TerraWdioTreeModel(getProject());
         TerraWdioTree tree = new TerraWdioTree(treeModel);
-        TerraWdioTreeSpecNode spec = ((TerraWdioTreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
-        TerraWdioTreeScreenshotNode screenshot = spec.getScreenshot(0);
+        TreeSpecNode spec = ((TreeModelDataRoot) treeModel.getRoot()).getSpecs().get(0);
+        TreeScreenshotNode screenshot = spec.getScreenshot(0);
         tree.addSelectionPath(new TreePath(new Object[]{treeModel.getRoot(), spec, screenshot}));
         return tree;
     }
diff --git a/src/test/java/com/picimako/terra/wdio/toolwindow/action/ScreenshotContextParserTest.java b/src/test/java/com/picimako/terra/wdio/toolwindow/action/TerraToolkitScreenshotContextParserTest.java
similarity index 73%
rename from src/test/java/com/picimako/terra/wdio/toolwindow/action/ScreenshotContextParserTest.java
rename to src/test/java/com/picimako/terra/wdio/toolwindow/action/TerraToolkitScreenshotContextParserTest.java
index 8aa9edc..2aa23b1 100644
--- a/src/test/java/com/picimako/terra/wdio/toolwindow/action/ScreenshotContextParserTest.java
+++ b/src/test/java/com/picimako/terra/wdio/toolwindow/action/TerraToolkitScreenshotContextParserTest.java
@@ -20,22 +20,22 @@
 
 import org.junit.Test;
 
-import com.picimako.terra.wdio.imagepreview.ScreenshotContextParser;
+import com.picimako.terra.wdio.TerraToolkitScreenshotContextParser;
 
 /**
- * Unit test for {@link ScreenshotContextParser}.
+ * Unit test for {@link TerraToolkitScreenshotContextParser}.
  */
-public class ScreenshotContextParserTest {
+public class TerraToolkitScreenshotContextParserTest {
 
     @Test
     public void shouldReturnScreenshotContextString() {
         String path = "/home/project/tests/wdio/__snapshots__/diff/en/chrome_enormous/some-spec/a_screenshot.png";
-        assertThat(new ScreenshotContextParser().parse(path)).isEqualTo("en | chrome | enormous");
+        assertThat(new TerraToolkitScreenshotContextParser().parse(path)).isEqualTo("en / chrome / enormous");
     }
 
     @Test
     public void shouldReturnScreenshotContextStringFromNestedFolder() {
         String path = "/home/project/tests/wdio/nested/__snapshots__/diff/en/chrome_enormous/some-spec/a_screenshot.png";
-        assertThat(new ScreenshotContextParser().parse(path)).isEqualTo("en | chrome | enormous");
+        assertThat(new TerraToolkitScreenshotContextParser().parse(path)).isEqualTo("en / chrome / enormous");
     }
 }
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspectionTest.java
index 2bf24ad..7836934 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateDescribeViewportsBlockInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link DuplicateDescribeViewportsBlockInspection}.
  */
-public class DuplicateDescribeViewportsBlockInspectionTest extends TerraInspectionBaseTestCase {
+public class DuplicateDescribeViewportsBlockInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateTerraDescribeViewportsInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateTerraDescribeViewportsInspectionTest.java
index b0319be..44f5c83 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateTerraDescribeViewportsInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/DuplicateTerraDescribeViewportsInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link TerraDescribeViewportsInspection}.
  */
-public class DuplicateTerraDescribeViewportsInspectionTest extends TerraInspectionBaseTestCase {
+public class DuplicateTerraDescribeViewportsInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest.java
index ab80be4..5d325f7 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link NestedTerraDescribeViewportsBlocksNotAllowedInspection}.
  */
-public class NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest extends TerraInspectionBaseTestCase {
+public class NestedTerraDescribeViewportsBlocksNotAllowedInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/TerraViewportsNotInAscendingOrderInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/TerraViewportsNotInAscendingOrderInspectionTest.java
index f8e4151..216208c 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/TerraViewportsNotInAscendingOrderInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/TerraViewportsNotInAscendingOrderInspectionTest.java
@@ -19,12 +19,12 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 
 /**
  * Unit test for {@link TerraDescribeViewportsInspection}.
  */
-public class TerraViewportsNotInAscendingOrderInspectionTest extends TerraInspectionBaseTestCase {
+public class TerraViewportsNotInAscendingOrderInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NoActualTerraViewportsInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NoActualTerraViewportsInspectionTest.java
index 8ac7c95..33db5f1 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NoActualTerraViewportsInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NoActualTerraViewportsInspectionTest.java
@@ -19,13 +19,13 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 import com.picimako.terra.wdio.viewports.inspection.TerraDescribeViewportsBlockingInspection;
 
 /**
  * Unit test for {@link TerraDescribeViewportsBlockingInspection}.
  */
-public class NoActualTerraViewportsInspectionTest extends TerraInspectionBaseTestCase {
+public class NoActualTerraViewportsInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NonArrayTypeViewportsInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NonArrayTypeViewportsInspectionTest.java
index 72df595..73004b4 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NonArrayTypeViewportsInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NonArrayTypeViewportsInspectionTest.java
@@ -19,13 +19,13 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 import com.picimako.terra.wdio.viewports.inspection.TerraDescribeViewportsBlockingInspection;
 
 /**
  * Unit test for {@link TerraDescribeViewportsBlockingInspection}.
  */
-public class NonArrayTypeViewportsInspectionTest extends TerraInspectionBaseTestCase {
+public class NonArrayTypeViewportsInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NotSupportedTerraDescribeViewportsInspectionTest.java b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NotSupportedTerraDescribeViewportsInspectionTest.java
index 6f261d7..5245da3 100644
--- a/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NotSupportedTerraDescribeViewportsInspectionTest.java
+++ b/src/test/java/com/picimako/terra/wdio/viewports/inspection/blocking/NotSupportedTerraDescribeViewportsInspectionTest.java
@@ -19,13 +19,13 @@
 import com.intellij.codeInspection.InspectionProfileEntry;
 import org.jetbrains.annotations.Nullable;
 
-import com.picimako.terra.wdio.TerraInspectionBaseTestCase;
+import com.picimako.terra.wdio.TerraToolkitInspectionTestCase;
 import com.picimako.terra.wdio.viewports.inspection.TerraDescribeViewportsBlockingInspection;
 
 /**
  * Unit test for {@link TerraDescribeViewportsBlockingInspection}.
  */
-public class NotSupportedTerraDescribeViewportsInspectionTest extends TerraInspectionBaseTestCase {
+public class NotSupportedTerraDescribeViewportsInspectionTest extends TerraToolkitInspectionTestCase {
 
     @Override
     protected String getTestDataPath() {
diff --git a/testdata/terra/functestroot/package.json b/testdata/terra/functestroot/package.json
new file mode 100644
index 0000000..c793c78
--- /dev/null
+++ b/testdata/terra/functestroot/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "terra-support",
+  "devDependencies": {
+    "@cerner/terra-functional-testing": "^1.5.0"
+  }
+}
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameWithTestId-spec.js b/testdata/terra/functestroot/tests/wdio/CollectScreenshots-spec.js
similarity index 78%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameWithTestId-spec.js
rename to testdata/terra/functestroot/tests/wdio/CollectScreenshots-spec.js
index e0337eb..b0b25bf 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameWithTestId-spec.js
+++ b/testdata/terra/functestroot/tests/wdio/CollectScreenshots-spec.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreenshot('with name <caret>[default]', { selector: '#selector' });
+describe('terra', () => {
+    it('Test case', () => {
+        Terra.validates.screenshot('<caret>terra screenshot', { selector: '#selector' });
     });
 });
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribeName-spec.js b/testdata/terra/functestroot/tests/wdio/FindUnusedScreenshot-spec.js
similarity index 82%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribeName-spec.js
rename to testdata/terra/functestroot/tests/wdio/FindUnusedScreenshot-spec.js
index d259795..be76559 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribeName-spec.js
+++ b/testdata/terra/functestroot/tests/wdio/FindUnusedScreenshot-spec.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,5 @@
  */
 
 describe('outer describe', () => {
-    describe(() => {
-        Terra.it.matchesScreen<caret>shot({ selector: '#selector' });
-    });
+    Terra.validates.element('terra screenshot');
 });
diff --git a/testdata/terra/functestroot/tests/wdio/__snapshots__/latest/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png b/testdata/terra/functestroot/tests/wdio/__snapshots__/latest/clinical-lowlight-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hJf1F&Arj%qKmPx>XJGxu^l!OoV+&B6!PC{x
JWt~$(69DNq9##MV

literal 0
HcmV?d00001

diff --git a/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png b/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/clinical-lowlight-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hJf1F&Arj%qKmPx>XJGxu^l!OoV+&B6!PC{x
JWt~$(69DNq9##MV

literal 0
HcmV?d00001

diff --git a/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png b/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/CollectScreenshots-spec/terra_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hJf1F&Arj%qKmPx>XJGxu^l!OoV+&B6!PC{x
JWt~$(69DNq9##MV

literal 0
HcmV?d00001

diff --git a/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/FindUnusedScreenshot-spec/terra_screenshot.png b/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_huge/FindUnusedScreenshot-spec/terra_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hJf1F&Arj%qKmPx>XJGxu^l!OoV+&B6!PC{x
JWt~$(69DNq9##MV

literal 0
HcmV?d00001

diff --git a/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png b/testdata/terra/functestroot/tests/wdio/__snapshots__/reference/terra-default-theme/en/chrome_medium/CollectScreenshots-spec/terra_screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..818c71d03f435db011069584cda25c1f66af1a85
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz_7)VaDV6D^h@hJf1F&Arj%qKmPx>XJGxu^l!OoV+&B6!PC{x
JWt~$(69DNq9##MV

literal 0
HcmV?d00001

diff --git a/testdata/terra/inspection/wdio/screenshot/DuplicateScreenshotName-spec.js b/testdata/terra/inspection/wdio/screenshot/DuplicateScreenshotName-spec.js
new file mode 100644
index 0000000..dc54219
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/DuplicateScreenshotName-spec.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* global Terra, describe */
+Terra.describeViewports('Test', ['tiny', 'small', 'medium', 'large', 'huge', 'enormous'], () => {
+    describe('A describe block', () => {
+        it('duplicate', () => {
+            Terra.validates.element(<error descr="There is more than one assertion specified with this screenshot name. That is not allowed in terra-functional-testing.">'test case'</error>);
+        });
+
+        it('non-duplicate', () => {
+            Terra.validates.screenshot('test');
+        });
+
+        it('duplicate', () => {
+            Terra.validates.screenshot(<error descr="There is more than one assertion specified with this screenshot name. That is not allowed in terra-functional-testing.">'test case'</error>);
+        });
+    });
+
+    Terra.it.validatesElement('test case', { misMatchTolerance: 0 });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationProperties-spec.js b/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationProperties-spec.js
new file mode 100644
index 0000000..7c0bbf4
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationProperties-spec.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* global Terra, describe */
+Terra.describeViewports('Test', ['large', 'huge'], () => {
+
+    // No-highlight cases
+
+    describe('A describe block', () => {
+        it('an it block', () => {
+            Terra.validates.element({ misMatchTolerance: 0.5 });
+            Terra.validates.screenshot({ selector: '#id' });
+            Terra.validates.accessibility({ axeRules: '' });
+        });
+    });
+
+    Terra.it.validatesElement();
+    Terra.it.matchesScreenshot();
+    Terra.it.isAccessible();
+
+    //Highlight cases
+
+    describe('A describe block', () => {
+        it('an it block', () => {
+            Terra.validates.element({ <error descr="This is not a valid property for this validation. The valid ones to use are: [selector, misMatchTolerance, axeRules]">selecta</error>: '#id' });
+            Terra.validates.screenshot('name', { <error descr="This is not a valid property for this validation. The valid ones to use are: [misMatchTolerance, selector, viewports]">misMatchTol</error>: 0.5, <error descr="This is not a valid property for this validation. The valid ones to use are: [misMatchTolerance, selector, viewports]">axe</error>: '' });
+            Terra.validates.accessibility({ <error descr="This is not a valid property for this validation. The valid ones to use are: [axeRules]">x</error>: ''});
+        });
+    });
+
+    Terra.it.validatesElement({ <error descr="This is not a valid property for this validation. The valid ones to use are: [selector, misMatchTolerance, axeRules]">selecta</error>: '#id' });
+    Terra.it.matchesScreenshot('name', { <error descr="This is not a valid property for this validation. The valid ones to use are: [misMatchTolerance, selector, viewports]">misMatchTol</error>: 0.5, <error descr="This is not a valid property for this validation. The valid ones to use are: [misMatchTolerance, selector, viewports]">axe</error>: '' });
+    Terra.it.isAccessible({ <error descr="This is not a valid property for this validation. The valid ones to use are: [axeRules]">x</error>: ''});
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationPropertiesTerraFunctionalTesting-spec.js b/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationPropertiesTerraFunctionalTesting-spec.js
new file mode 100644
index 0000000..2f81f69
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/InvalidTerraValidationPropertiesTerraFunctionalTesting-spec.js
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* global Terra, describe */
+Terra.describeViewports('Test', ['large', 'huge'], () => {
+
+    // No-highlight cases
+
+    describe('A describe block', () => {
+        it('an it block', () => {
+            Terra.validates.element({ mismatchTolerance: 0.5 });
+            Terra.validates.screenshot({ selector: '#id' });
+            Terra.validates.accessibility({ rules: '' });
+        });
+    });
+
+    //Highlight cases
+
+    describe('A describe block', () => {
+        it('an it block', () => {
+            Terra.validates.element({ <error descr="This is not a valid property for this validation. The valid ones to use are: [selector, mismatchTolerance, rules]">selecta</error>: '#id' });
+            Terra.validates.screenshot('name', { <error descr="This is not a valid property for this validation. The valid ones to use are: [mismatchTolerance, selector]">misMatchTolerance</error>: 0.5, <error descr="This is not a valid property for this validation. The valid ones to use are: [mismatchTolerance, selector]">axe</error>: '' });
+            Terra.validates.accessibility({ <error descr="This is not a valid property for this validation. The valid ones to use are: [rules]">axeRules</error>: ''});
+        });
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/MandatoryNameParameter-spec.js b/testdata/terra/inspection/wdio/screenshot/MandatoryNameParameter-spec.js
new file mode 100644
index 0000000..b335539
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/MandatoryNameParameter-spec.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* global Terra, describe */
+Terra.describeViewports('Test', ['tiny', 'small', 'medium', 'large', 'huge', 'enormous'], () => {
+    describe('A describe block', () => {
+        it('no-highlight cases for element', () => {
+            Terra.validates.element('test case');
+            Terra.validates.element('test case', { misMatchTolerance: 0 });
+        });
+
+        it('no-highlight cases for screenshot', () => {
+            Terra.validates.screenshot('test case');
+            Terra.validates.screenshot('test case', { misMatchTolerance: 0 });
+        });
+
+        it('highlight cases for element', () => {
+            <error descr="The name argument must be specified.">Terra.validates.element</error>();
+            <error descr="The name argument must be specified.">Terra.validates.element</error>({ misMatchTolerance: 10 });
+        });
+
+        it('highlight cases for screenshot', () => {
+            <error descr="The name argument must be specified.">Terra.validates.screenshot</error>();
+            <error descr="The name argument must be specified.">Terra.validates.screenshot</error>({ misMatchTolerance: 10 });
+        });
+    });
+
+    //no-highlight cases for validatesElement
+    Terra.it.validatesElement('test case');
+    Terra.it.validatesElement('test case', { misMatchTolerance: 0 });
+
+    //no-highlight cases for matchesScreenshot
+    Terra.it.matchesScreenshot('test case');
+    Terra.it.matchesScreenshot('test case', { misMatchTolerance: 0 });
+
+    //highlight cases for validatesElement
+    Terra.it.validatesElement();
+    Terra.it.validatesElement({ misMatchTolerance: 10 });
+
+    //highlight cases for matchesScreenshot
+    Terra.it.matchesScreenshot();
+    Terra.it.matchesScreenshot({ misMatchTolerance: 10 });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/TriplicateScreenshotName-spec.js b/testdata/terra/inspection/wdio/screenshot/TriplicateScreenshotName-spec.js
new file mode 100644
index 0000000..80168ab
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/TriplicateScreenshotName-spec.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* global Terra, describe */
+Terra.describeViewports('Test', ['tiny', 'small', 'medium', 'large', 'huge', 'enormous'], () => {
+    describe('A describe block', () => {
+        it('triplicate', () => {
+            Terra.validates.element(<error descr="There is more than one assertion specified with this screenshot name. That is not allowed in terra-functional-testing.">'test case'</error>);
+        });
+
+        it('non-triplicate', () => {
+            Terra.validates.screenshot('test');
+        });
+
+        it('triplicate', () => {
+            Terra.validates.screenshot(<error descr="There is more than one assertion specified with this screenshot name. That is not allowed in terra-functional-testing.">'test case'</error>);
+        });
+
+        it('non-triplicate', () => {
+            Terra.validates.screenshot('test 2');
+        });
+
+        it('triplicate', () => {
+            Terra.validates.screenshot('test case');
+        });
+    });
+
+    Terra.it.validatesElement('test case', { misMatchTolerance: 0 });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/package.json b/testdata/terra/inspection/wdio/screenshot/package.json
new file mode 100644
index 0000000..c793c78
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "terra-support",
+  "devDependencies": {
+    "@cerner/terra-functional-testing": "^1.5.0"
+  }
+}
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithTestId-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.after.js
similarity index 78%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithTestId-spec.js
rename to testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.after.js
index 4632117..111777e 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithTestId-spec.js
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.after.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreenshot('with name <caret>[test id]', { selector: '#selector' });
+describe("", () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.accessibility();
     });
 });
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribe-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.js
similarity index 84%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribe-spec.js
rename to testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.js
index 15cc41d..efd1bad 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameNoParentDescribe-spec.js
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibility-spec.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 Tamás Balog
+ * Copyright 2021 Tamás Balog
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-{
-    Terra.it.matchesScreen<caret>shot({ selector: '#selector' });
-}
+describe("", () => {
+    <caret>Terra.it.isAccessible();
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.after.js
new file mode 100644
index 0000000..1c8eb4f
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.accessibility({axeRules: {}});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.js
new file mode 100644
index 0000000..4cf3295
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/accessibility/ItValidatesAccessibilityWithArguments-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    <caret>Terra.it.isAccessible({ axeRules: {} });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.after.js
new file mode 100644
index 0000000..2faf5a2
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe("", () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element();
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.js
new file mode 100644
index 0000000..e24c208
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElement-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe("", () => {
+    <caret>Terra.it.validatesElement();
+});
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithNonMatchingTestId-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.after.js
similarity index 78%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithNonMatchingTestId-spec.js
rename to testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.after.js
index eb30bb0..dc65230 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithNonMatchingTestId-spec.js
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.after.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreenshot('with name <caret>[tes)t id]', { selector: '#selector' });
+describe('', () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('name', {selector: '#selector', misMatchTolerance: 0.5});
     });
 });
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.js
new file mode 100644
index 0000000..f097b02
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithArguments-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    <caret>Terra.it.validatesElement('name', { selector: '#selector', misMatchTolerance: 0.5 });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.after.js
new file mode 100644
index 0000000..f85160b
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.after.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    
+    it('INSERT TEST NAME', () => {
+        browser.url('/');
+        browser.url('/?param=value');
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithMultipleTestIds-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.js
similarity index 76%
rename from testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithMultipleTestIds-spec.js
rename to testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.js
index 603de1a..62a57d2 100644
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveNameWithMultipleTestIds-spec.js
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHook-spec.js
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreenshot('with <caret>[test id] and another [testid]', { selector: '#selector' });
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
     });
+    Terra.it.vali<caret>datesElement('test name', { selector: '#selector' });
 });
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.after.js
new file mode 100644
index 0000000..2738f46
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.after.js
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    describe('', () => {
+    });
+
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.js
new file mode 100644
index 0000000..7d0b4de
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndDescribeBlockInBetween-spec.js
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    describe('', () => {
+    });
+
+    Terra.it.vali<caret>datesElement('test name', { selector: '#selector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.after.js
new file mode 100644
index 0000000..1b9f5e2
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.after.js
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    it('test ', () => {
+        $('#selector').isVisible();
+    });
+
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.js
new file mode 100644
index 0000000..cbf8968
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndItBlockInBetween-spec.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    it('test ', () => {
+        $('#selector').isVisible();
+    });
+
+    Terra.it.vali<caret>datesElement('test name', { selector: '#selector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.after.js
new file mode 100644
index 0000000..530b4f8
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.after.js
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    
+
+    var someVariable;
+
+    it('INSERT TEST NAME', () => {
+        browser.url('/');
+        browser.url('/?param=value');
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.js
new file mode 100644
index 0000000..a30a531
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookMerged-spec.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    var someVariable;
+
+    Terra.it.vali<caret>datesElement('test name', { selector: '#selector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.after.js
new file mode 100644
index 0000000..ba4ef71
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.after.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    var someVariable;
+
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.js
new file mode 100644
index 0000000..a30a531
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookAndVarInBetweenBeforeHookUnchanged-spec.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+        browser.url('/?param=value');
+    });
+
+    var someVariable;
+
+    Terra.it.vali<caret>datesElement('test name', { selector: '#selector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.after.js
new file mode 100644
index 0000000..7a95e74
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.after.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test name', {selector: '#selector'});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.js
new file mode 100644
index 0000000..1945d5f
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithBeforeHookUnchanged-spec.js
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    <caret>Terra.it.validatesElement('test name', { selector: '#selector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.after.js
new file mode 100644
index 0000000..0ffde51
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('name');
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.js
new file mode 100644
index 0000000..b400f51
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesElementWithName-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    <caret>Terra.it.validatesElement('name');
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.after.js
new file mode 100644
index 0000000..1c8887f
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.after.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    
+    it('INSERT TEST NAME', () => {
+        browser.url('/');
+        Terra.validates.element('test', {selector: '#selector'});
+    });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.js
new file mode 100644
index 0000000..922e818
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHook-spec.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    Terra.<caret>it.validatesElement('test', { selector: '#selector' });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.after.js
new file mode 100644
index 0000000..982bc5f
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.after.js
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test', {selector: '#selector'});
+    });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.js
new file mode 100644
index 0000000..922e818
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithImmediateBeforeHookUnchanged-spec.js
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    Terra.<caret>it.validatesElement('test', { selector: '#selector' });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.after.js
new file mode 100644
index 0000000..9caf634
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.after.js
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+    it('INSERT TEST NAME', () => {
+        Terra.validates.element('test', { selector: '#selector' });
+    });
+    Terra.it.isAccessible();
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.js
new file mode 100644
index 0000000..abc72ab
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/element/ItValidatesesWithNoImmediateBeforeHook-spec.js
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    before(() => {
+        browser.url('/');
+    });
+    Terra.it.matchesScreenshot('test', { selector: '#anotherselector' });
+    Terra.<caret>it.validatesElement('test', { selector: '#selector' });
+    Terra.it.isAccessible();
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.after.js
new file mode 100644
index 0000000..424bcb8
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe("", () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.screenshot();
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.js
new file mode 100644
index 0000000..939fd28
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshot-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe("", () => {
+    <caret>Terra.it.matchesScreenshot();
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.after.js
new file mode 100644
index 0000000..15702d4
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.screenshot('name', {selector: '#selector', misMatchTolerance: 0.5});
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.js
new file mode 100644
index 0000000..212dff7
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithArguments-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    <caret>Terra.it.matchesScreenshot('name', { selector: '#selector', misMatchTolerance: 0.5 });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.after.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.after.js
new file mode 100644
index 0000000..720fcf9
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.after.js
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    it('INSERT TEST NAME', () => {
+        Terra.validates.screenshot('name');
+    });
+});
diff --git a/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.js b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.js
new file mode 100644
index 0000000..b19b42d
--- /dev/null
+++ b/testdata/terra/inspection/wdio/screenshot/replaceit/screenshot/ItValidatesScreenshotWithName-spec.js
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2021 Tamás Balog
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+describe('', () => {
+    <caret>Terra.it.matchesScreenshot('name');
+});
diff --git a/testdata/terra/projectroot/package.json b/testdata/terra/projectroot/package.json
new file mode 100644
index 0000000..c793c78
--- /dev/null
+++ b/testdata/terra/projectroot/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "terra-support",
+  "devDependencies": {
+    "@cerner/terra-functional-testing": "^1.5.0"
+  }
+}
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultName-spec.js b/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultName-spec.js
deleted file mode 100644
index 6f251e0..0000000
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultName-spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreen<caret>shot({ selector: '#selector' });
-    });
-});
diff --git a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameForNonDefaultValidation-spec.js b/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameForNonDefaultValidation-spec.js
deleted file mode 100644
index 81c4946..0000000
--- a/testdata/terra/projectroot/tests/wdio/nameResolution/resolveDefaultNameForNonDefaultValidation-spec.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Tamás Balog
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describe('outer describe', () => {
-    describe('terra screenshot', () => {
-        Terra.it.matchesScreen<caret>shot('default', { selector: '#selector' });
-    });
-});