diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 90e94a80..cd1a5283 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -187,7 +187,7 @@ rules:
     - {selector: [objectLiteralProperty, typeProperty], format: null, modifiers: [requiresQuotes]}
     - {selector: [classProperty, typeMethod], filter: '^toJSON$', format: null}
   '@typescript-eslint/no-import-type-side-effects': error
-  '@typescript-eslint/no-inferrable-types': error
+  '@typescript-eslint/no-inferrable-types': off
   '@typescript-eslint/no-invalid-void-type':
     [error, {allowInGenericTypeArguments: true, allowAsThisParameter: true}]
   '@typescript-eslint/no-loop-func': error
diff --git a/autotests/configurator/doAfterPack.ts b/autotests/configurator/doAfterPack.ts
index 0e414c3f..919cadd3 100644
--- a/autotests/configurator/doAfterPack.ts
+++ b/autotests/configurator/doAfterPack.ts
@@ -20,7 +20,7 @@ const assertExternalPackRunId: DoAfterPack = ({customReportProperties, endTimeIn
  * An array of functions that will be run after the pack.
  * This is an implementation for internal tests. You must remove it from your project.
  */
-export const doAfterPack = [
+export const doAfterPack: readonly DoAfterPack[] = [
   setExternalPackRunId,
   incrementExternalPackRunId,
   assertExternalPackRunId,
diff --git a/autotests/configurator/doBeforePack.ts b/autotests/configurator/doBeforePack.ts
index 7ea256ba..457fc975 100644
--- a/autotests/configurator/doBeforePack.ts
+++ b/autotests/configurator/doBeforePack.ts
@@ -26,7 +26,7 @@ const assertInternalPackRunId: DoBeforePack = ({fullPackConfig, startTimeInMs})
  * An array of functions that will be run before the pack.
  * This is an implementation for internal tests. You must remove it from your project.
  */
-export const doBeforePack = [
+export const doBeforePack: readonly DoBeforePack[] = [
   setInternalPackRunId,
   incrementInternalPackRunId,
   assertInternalPackRunId,
diff --git a/autotests/configurator/index.ts b/autotests/configurator/index.ts
index 5be1fda1..dbdbcc52 100644
--- a/autotests/configurator/index.ts
+++ b/autotests/configurator/index.ts
@@ -25,5 +25,6 @@ export type {
   MapLogPayloadInReport,
   Pack,
   SkipTests,
+  TestFunction,
   TestMeta,
 } from './types';
diff --git a/autotests/configurator/types/index.ts b/autotests/configurator/types/index.ts
index 8360652d..29aecba9 100644
--- a/autotests/configurator/types/index.ts
+++ b/autotests/configurator/types/index.ts
@@ -15,6 +15,7 @@ export type {
   MapLogPayloadInLogFile,
   MapLogPayloadInReport,
   Pack,
+  TestFunction,
 } from './packSpecific';
 export type {SkipTests} from './skipTests';
 export type {TestMeta} from './testMeta';
diff --git a/autotests/configurator/types/packSpecific.ts b/autotests/configurator/types/packSpecific.ts
index 90c6d6da..c4ccc859 100644
--- a/autotests/configurator/types/packSpecific.ts
+++ b/autotests/configurator/types/packSpecific.ts
@@ -22,4 +22,5 @@ export type MapBackendResponseToLog = PackSpecificTypes['MapBackendResponseToLog
 export type MapLogPayloadInConsole = PackSpecificTypes['MapLogPayloadInConsole'];
 export type MapLogPayloadInLogFile = PackSpecificTypes['MapLogPayloadInLogFile'];
 export type MapLogPayloadInReport = PackSpecificTypes['MapLogPayloadInReport'];
+export type TestFunction = PackSpecificTypes['TestFunction'];
 export type {Pack};
diff --git a/autotests/constants/attributesOptions.ts b/autotests/constants/attributesOptions.ts
index 6fe24a27..d9a4bc49 100644
--- a/autotests/constants/attributesOptions.ts
+++ b/autotests/constants/attributesOptions.ts
@@ -3,8 +3,8 @@ import type {AttributesOptions} from 'create-locator';
 /**
  * Attributes options for locators.
  */
-export const attributesOptions = {
+export const attributesOptions: AttributesOptions = {
   parameterAttributePrefix: 'data-test-',
   testIdAttribute: 'data-testid',
   testIdSeparator: '-',
-} as const satisfies AttributesOptions;
+};
diff --git a/autotests/context/pageCookies.ts b/autotests/context/pageCookies.ts
index f3edc9e9..768ed736 100644
--- a/autotests/context/pageCookies.ts
+++ b/autotests/context/pageCookies.ts
@@ -1,8 +1,22 @@
 import {useContext} from 'e2ed';
 
-import type {Cookie} from 'e2ed/types';
+import type {ClearContext, Cookie, GetContext, SetContext} from 'e2ed/types';
+
+type Cookies = readonly Cookie[];
+
+const [get, set, clear] = useContext<Cookies>();
+
+/**
+ * Get page cookies, that will be added when navigating to the page.
+ */
+export const getPageCookies: GetContext<Cookies> = get;
+
+/**
+ * Set page cookies, that will be added when navigating to the page.
+ */
+export const setPageCookies: SetContext<Cookies> = set;
 
 /**
- * Get, set and clear page cookies, that will be added when navigating to the page.
+ * Clear page cookies, that will be added when navigating to the page.
  */
-export const [getPageCookies, setPageCookies, clearPageCookies] = useContext<readonly Cookie[]>();
+export const clearPageCookies: ClearContext = clear;
diff --git a/autotests/context/pageRequestHeaders.ts b/autotests/context/pageRequestHeaders.ts
index 4216fbd3..bc433cf3 100644
--- a/autotests/context/pageRequestHeaders.ts
+++ b/autotests/context/pageRequestHeaders.ts
@@ -1,9 +1,20 @@
 import {useContext} from 'e2ed';
 
-import type {Headers} from 'e2ed/types';
+import type {ClearContext, GetContext, Headers, SetContext} from 'e2ed/types';
+
+const [get, set, clear] = useContext<Headers>();
+
+/**
+ * Get additional page request headers, that will be added when navigating to the page.
+ */
+export const getPageRequestHeaders: GetContext<Headers> = get;
+
+/**
+ * Set additional page request headers, that will be added when navigating to the page.
+ */
+export const setPageRequestHeaders: SetContext<Headers> = set;
 
 /**
- * Get, set and clear additional page request headers, that will be added when navigating to the page.
+ * Clear additional page request headers, that will be added when navigating to the page.
  */
-export const [getPageRequestHeaders, setPageRequestHeaders, clearPageRequestHeaders] =
-  useContext<Headers>();
+export const clearPageRequestHeaders: ClearContext = clear;
diff --git a/autotests/entities/product.ts b/autotests/entities/product.ts
index 5ecda081..fc4c5b67 100644
--- a/autotests/entities/product.ts
+++ b/autotests/entities/product.ts
@@ -1,11 +1,12 @@
 import {createClientFunction} from 'e2ed';
 
 import type {ApiProduct, Product} from 'autotests/types';
+import type {ClientFunction} from 'e2ed/types';
 
 /**
  * Adds product.
  */
-export const addProduct = createClientFunction(
+export const addProduct: ClientFunction<[Product], Promise<ApiProduct>> = createClientFunction(
   (product: Product) =>
     fetch(`https://reqres.in/api/product/${product.id}?size=${product.size}`, {
       body: JSON.stringify({
diff --git a/autotests/entities/worker.ts b/autotests/entities/worker.ts
index a8f8cb66..f209b235 100644
--- a/autotests/entities/worker.ts
+++ b/autotests/entities/worker.ts
@@ -2,6 +2,7 @@ import {createClientFunction} from 'e2ed';
 import {log} from 'e2ed/utils';
 
 import type {UserWorker} from 'autotests/types';
+import type {ClientFunction} from 'e2ed/types';
 
 const clientGetUsers = createClientFunction(
   (delay: number) =>
@@ -12,13 +13,13 @@ const clientGetUsers = createClientFunction(
 /**
  * Adds user-worker.
  */
-export const addUser = createClientFunction(
+export const addUser: ClientFunction<[UserWorker, number?], Promise<object>> = createClientFunction(
   (user: UserWorker, delay?: number) =>
     fetch(`https://reqres.in/api/users${delay !== undefined ? `?delay=${delay}` : ''}`, {
       body: JSON.stringify(user),
       headers: {'Content-Type': 'application/json; charset=UTF-8'},
       method: 'POST',
-    }).then((res) => res.json()),
+    }),
   {name: 'addUser', timeout: 3_000},
 );
 
diff --git a/autotests/pageObjects/pages/Main.ts b/autotests/pageObjects/pages/Main.ts
index 7ca6588f..3f038c27 100644
--- a/autotests/pageObjects/pages/Main.ts
+++ b/autotests/pageObjects/pages/Main.ts
@@ -1,9 +1,7 @@
 import {Input} from 'autotests/pageObjects/components';
 import {Main as MainRoute} from 'autotests/routes/pageRoutes';
-import {createSelectorByCss} from 'autotests/selectors';
-import {createRootLocator, type Locator} from 'create-locator';
+import {createSelector} from 'autotests/selectors';
 import {Page} from 'e2ed';
-import {getCssSelectorFromAttributesChain} from 'e2ed/createLocator';
 import {setReadonlyProperty} from 'e2ed/utils';
 
 import type {Language} from 'autotests/types';
@@ -12,17 +10,6 @@ import type {GetParamsType, Selector} from 'e2ed/types';
 type RouteParams = GetParamsType<MainRoute>;
 type CustomPageParams = Partial<RouteParams> | undefined;
 
-type MainLocator = Locator<{header: {}}>;
-
-const mainPageLocator = createRootLocator<MainLocator, Selector>('google', {
-  mapAttributesChain: (attributesChain) => {
-    const cssSelector = getCssSelectorFromAttributesChain(attributesChain);
-
-    return createSelectorByCss(cssSelector);
-  },
-  pathAttribute: 'data-testid',
-});
-
 /**
  * The Main (index) page.
  */
@@ -30,12 +17,12 @@ export class Main extends Page<CustomPageParams> {
   /**
    * Body selector.
    */
-  readonly body = createSelectorByCss('body');
+  readonly body: Selector = createSelector('body');
 
   /**
    * Header selector.
    */
-  readonly header = mainPageLocator.header();
+  readonly header: Selector = createSelector('[role=navigation]');
 
   /**
    * Page language.
@@ -45,7 +32,7 @@ export class Main extends Page<CustomPageParams> {
   /**
    * Search input.
    */
-  readonly searchInput = new Input('q');
+  readonly searchInput: Input = new Input('q');
 
   /**
    * Current value of search query.
diff --git a/autotests/selectors/selectorFunctions.ts b/autotests/selectors/createSelector.ts
similarity index 63%
rename from autotests/selectors/selectorFunctions.ts
rename to autotests/selectors/createSelector.ts
index 84214049..190adcf0 100644
--- a/autotests/selectors/selectorFunctions.ts
+++ b/autotests/selectors/createSelector.ts
@@ -1,9 +1,11 @@
-import {createSelectorFunctions} from 'e2ed/selectors';
+import {createSelectorFunction} from 'e2ed/selectors';
+
+import type {CreateSelector} from 'e2ed/types';
 
 /**
  * Main functions for creating selectors and working with selectors.
  */
-export const {createSelector, createSelectorByCss, htmlElementSelector} = createSelectorFunctions({
+export const createSelector: CreateSelector = createSelectorFunction({
   getLocatorAttributeName: (parameter) => {
     if (parameter === 'id') {
       return 'data-testid';
diff --git a/autotests/selectors/htmlElementSelector.ts b/autotests/selectors/htmlElementSelector.ts
new file mode 100644
index 00000000..dd29bb2a
--- /dev/null
+++ b/autotests/selectors/htmlElementSelector.ts
@@ -0,0 +1,8 @@
+import {createSelector} from './createSelector';
+
+import type {Selector} from 'e2ed/types';
+
+/**
+ * Selector of HTML element.
+ */
+export const htmlElementSelector: Selector = createSelector('html');
diff --git a/autotests/selectors/index.ts b/autotests/selectors/index.ts
index 3b2d5f2d..5fc06703 100644
--- a/autotests/selectors/index.ts
+++ b/autotests/selectors/index.ts
@@ -1,3 +1,4 @@
+export {createSelector} from './createSelector';
+export {htmlElementSelector} from './htmlElementSelector';
 export {inputSelector} from './inputSelector';
 export {cssSelector, locator, testId} from './locator';
-export {createSelector, createSelectorByCss, htmlElementSelector} from './selectorFunctions';
diff --git a/autotests/selectors/inputSelector.ts b/autotests/selectors/inputSelector.ts
index 965de33a..c69718bd 100644
--- a/autotests/selectors/inputSelector.ts
+++ b/autotests/selectors/inputSelector.ts
@@ -1,8 +1,8 @@
-import {createSelectorByCss} from 'autotests/selectors';
+import {createSelector} from './createSelector';
 
 import type {Selector} from 'e2ed/types';
 
 /**
  * Selector of input (or textarea) element by name.
  */
-export const inputSelector = (name: string): Selector => createSelectorByCss(`[name="${name}"]`);
+export const inputSelector = (name: string): Selector => createSelector(`[name="${name}"]`);
diff --git a/autotests/selectors/locator.ts b/autotests/selectors/locator.ts
index cea74432..a58406aa 100644
--- a/autotests/selectors/locator.ts
+++ b/autotests/selectors/locator.ts
@@ -1,18 +1,32 @@
 import {attributesOptions} from 'autotests/constants';
 import {createTestUtils} from 'e2ed/createLocator';
 
-import {createSelectorByCss} from './selectorFunctions';
+import {createSelector} from './createSelector';
+
+import type {LocatorFunction} from 'create-locator';
+import type {Selector} from 'e2ed/types';
 
 /**
- * Test utils, that produce `Selector`.
+ * Test utils, that produce `Selector`, CSS selector string and `testId` string.
  */
-export const {
-  locator,
-  selector: cssSelector,
-  testId,
-} = createTestUtils({
+const utils = createTestUtils({
   attributesOptions,
   createLocatorByCssSelector: (selector) =>
-    createSelectorByCss(selector.replace('data-test-runhash', 'data-runhash')),
+    createSelector(selector.replace('data-test-runhash', 'data-runhash')),
   supportWildcardsInCssSelectors: true,
 });
+
+/**
+ * Locator, that produce `Selector`.
+ */
+export const locator: LocatorFunction<Selector> = utils.locator;
+
+/**
+ * Locator, that produce CSS selector string.
+ */
+export const cssSelector: LocatorFunction<string> = utils.selector;
+
+/**
+ * Locator, that produce `testId` string.
+ */
+export const testId: LocatorFunction<string> = utils.testId;
diff --git a/autotests/test.ts b/autotests/test.ts
index 5f816b31..0dd601ec 100644
--- a/autotests/test.ts
+++ b/autotests/test.ts
@@ -2,10 +2,10 @@ import {createTestFunction} from 'e2ed';
 
 import * as hooks from './hooks';
 
-import type {Pack} from 'autotests/configurator';
+import type {Pack, TestFunction} from 'autotests/configurator';
 
 /**
  * Test function that describes the test or the task
  * (test does not necessarily contain checks).
  */
-export const test = createTestFunction<Pack>(hooks);
+export const test: TestFunction = createTestFunction<Pack>(hooks);
diff --git a/autotests/tests/expect.ts b/autotests/tests/expect.ts
index 98f00157..0c9b366f 100644
--- a/autotests/tests/expect.ts
+++ b/autotests/tests/expect.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-magic-numbers */
 
 import {test} from 'autotests';
-import {createSelectorByCss} from 'autotests/selectors';
+import {htmlElementSelector} from 'autotests/selectors';
 import {getFullPackConfig} from 'autotests/utils';
 import {expect} from 'e2ed';
 import {assertFunctionThrows, getTimeoutPromise} from 'e2ed/utils';
@@ -41,8 +41,6 @@ test('expect function works correctly', {meta: {testId: '16'}}, async () => {
   // eslint-disable-next-line @typescript-eslint/await-thenable
   await expect(1, 'should be an eslint error when we do not call the assertion method');
 
-  const htmlSelector = createSelectorByCss('html');
-
   // @ts-expect-error: expect function should not accept a selector as a actual value
-  await expect(htmlSelector, 'should be type error when actual value is a selector').ok();
+  await expect(htmlElementSelector, 'should be type error when actual value is a selector').ok();
 });
diff --git a/autotests/tests/internalTypeTests/selectors.skip.ts b/autotests/tests/internalTypeTests/selectors.skip.ts
index 99734a16..a0a98762 100644
--- a/autotests/tests/internalTypeTests/selectors.skip.ts
+++ b/autotests/tests/internalTypeTests/selectors.skip.ts
@@ -1,9 +1,4 @@
-import {
-  createSelector,
-  createSelectorByCss,
-  htmlElementSelector,
-  locator,
-} from 'autotests/selectors';
+import {createSelector, htmlElementSelector, locator} from 'autotests/selectors';
 
 import type {Selector} from 'e2ed/types';
 
@@ -22,11 +17,7 @@ htmlElementSelector.find('body').findByLocatorId('id') satisfies Selector;
 
 // ok
 createSelector('id').findByLocatorId('id').find('body').findByLocatorId('id') satisfies Selector;
-// ok
-createSelectorByCss('id')
-  .findByLocatorId('id')
-  .find('body')
-  .findByLocatorId('id') satisfies Selector;
+
 // ok
 locator('id').findByLocatorId('id').find('body').findByLocatorId('id') satisfies Selector;
 
diff --git a/package-lock.json b/package-lock.json
index 3669d9a8..cb121cca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.18.14",
       "license": "MIT",
       "dependencies": {
-        "@playwright/test": "1.47.2",
+        "@playwright/test": "1.48.1",
         "create-locator": "0.0.25",
         "get-modules-graph": "0.0.9",
         "globby": "11.1.0"
@@ -19,8 +19,8 @@
         "e2ed-init": "bin/init.js"
       },
       "devDependencies": {
-        "@playwright/browser-chromium": "1.47.2",
-        "@types/node": "22.7.4",
+        "@playwright/browser-chromium": "1.48.1",
+        "@types/node": "22.7.6",
         "@typescript-eslint/eslint-plugin": "7.18.0",
         "@typescript-eslint/parser": "7.18.0",
         "assert-modules-support-case-insensitive-fs": "1.0.1",
@@ -30,10 +30,10 @@
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.31.0",
         "eslint-plugin-simple-import-sort": "12.1.1",
-        "eslint-plugin-typescript-sort-keys": "3.2.0",
+        "eslint-plugin-typescript-sort-keys": "3.3.0",
         "husky": "9.1.6",
         "prettier": "3.3.3",
-        "typescript": "5.6.2"
+        "typescript": "5.6.3"
       },
       "engines": {
         "node": ">=16.11.1"
@@ -179,26 +179,26 @@
       }
     },
     "node_modules/@playwright/browser-chromium": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.47.2.tgz",
-      "integrity": "sha512-tsk9bLcGzIu4k4xI2ixlwDrdJhMqCalUCsSj7TRI8VuvK7cLiJIa5SR0dprKbX+wkku/JMR4EN6g9DMHvfna+Q==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/@playwright/browser-chromium/-/browser-chromium-1.48.1.tgz",
+      "integrity": "sha512-WNpIE+CpO4XNhdNTC/mVE8m/1gYR/hPswL8dnIZzElqxsOPm7qxIBdAChWm/7q1kkMiQ+gEGAaXXQfqL0vR28w==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.47.2"
+        "playwright-core": "1.48.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.47.2.tgz",
-      "integrity": "sha512-jTXRsoSPONAs8Za9QEQdyjFn+0ZQFjCiIztAIF6bi1HqhBzG9Ma7g1WotyiGqFSBRZjIEqMdT8RUlbk1QVhzCQ==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.48.1.tgz",
+      "integrity": "sha512-s9RtWoxkOLmRJdw3oFvhFbs9OJS0BzrLUc8Hf6l2UdCNd1rqeEyD4BhCJkvzeEoD1FsK4mirsWwGerhVmYKtZg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.47.2"
+        "playwright": "1.48.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -227,9 +227,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "22.7.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.4.tgz",
-      "integrity": "sha512-y+NPi1rFzDs1NdQHHToqeiX2TIS79SWEAw9GYhkkx8bD0ChpfqC+n2j5OXOCpzfojBEBt6DnEnnG9MY0zk1XLg==",
+      "version": "22.7.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.6.tgz",
+      "integrity": "sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1256,10 +1256,11 @@
       }
     },
     "node_modules/eslint-plugin-typescript-sort-keys": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-typescript-sort-keys/-/eslint-plugin-typescript-sort-keys-3.2.0.tgz",
-      "integrity": "sha512-GutszvriaVtwmn7pQjuj9/9o0iXhD7XZs0/424+zsozdRr/fdg5e8206t478Vnqnqi1GjuxcAolj1kf74KnhPA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-typescript-sort-keys/-/eslint-plugin-typescript-sort-keys-3.3.0.tgz",
+      "integrity": "sha512-bRW3Rc/VNdrSP9OoY5wgjjaXCOOkZKpzvl/Mk6l8Sg8CMehVIcg9K4y33l+ZcZiknpl0aR6rKusxuCJNGZWmVw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@typescript-eslint/experimental-utils": "^5.0.0",
         "json-schema": "^0.4.0",
@@ -1269,7 +1270,7 @@
         "node": ">= 16"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^6 || ^7",
+        "@typescript-eslint/parser": ">=6",
         "eslint": "^7 || ^8",
         "typescript": "^3 || ^4 || ^5"
       }
@@ -2728,12 +2729,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.47.2.tgz",
-      "integrity": "sha512-nx1cLMmQWqmA3UsnjaaokyoUpdVaaDhJhMoxX2qj3McpjnsqFHs516QAKYhqHAgOP+oCFTEOCOAaD1RgD/RQfA==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.48.1.tgz",
+      "integrity": "sha512-j8CiHW/V6HxmbntOfyB4+T/uk08tBy6ph0MpBXwuoofkSnLmlfdYNNkFTYD6ofzzlSqLA1fwH4vwvVFvJgLN0w==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.47.2"
+        "playwright-core": "1.48.1"
       },
       "bin": {
         "playwright": "cli.js"
@@ -2746,9 +2747,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.47.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.47.2.tgz",
-      "integrity": "sha512-3JvMfF+9LJfe16l7AbSmU555PaTl2tPyQsVInqm3id16pdDfvZ8TTZ/pyzmkbDrZTQefyzU7AIHlZqQnxpqHVQ==",
+      "version": "1.48.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.48.1.tgz",
+      "integrity": "sha512-Yw/t4VAFX/bBr1OzwCuOMZkY1Cnb4z/doAFSwf4huqAGWmf9eMNjmK7NiOljCdLmxeRYcGPPmcDgU0zOlzP0YA==",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"
@@ -3299,9 +3300,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-      "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
diff --git a/package.json b/package.json
index 844b5869..77042d28 100644
--- a/package.json
+++ b/package.json
@@ -24,14 +24,14 @@
     "url": "git+https://github.com/joomcode/e2ed.git"
   },
   "dependencies": {
-    "@playwright/test": "1.47.2",
+    "@playwright/test": "1.48.1",
     "create-locator": "0.0.25",
     "get-modules-graph": "0.0.9",
     "globby": "11.1.0"
   },
   "devDependencies": {
-    "@playwright/browser-chromium": "1.47.2",
-    "@types/node": "22.7.4",
+    "@playwright/browser-chromium": "1.48.1",
+    "@types/node": "22.7.6",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "assert-modules-support-case-insensitive-fs": "1.0.1",
@@ -41,10 +41,10 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.31.0",
     "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-typescript-sort-keys": "3.2.0",
+    "eslint-plugin-typescript-sort-keys": "3.3.0",
     "husky": "9.1.6",
     "prettier": "3.3.3",
-    "typescript": "5.6.2"
+    "typescript": "5.6.3"
   },
   "peerDependencies": {
     "@types/node": ">=20",
diff --git a/src/ApiRoute.ts b/src/ApiRoute.ts
index e677210d..2178a3b1 100644
--- a/src/ApiRoute.ts
+++ b/src/ApiRoute.ts
@@ -1,23 +1,6 @@
 import {Route} from './Route';
 
-import type {
-  Method,
-  Request,
-  RequestKeyType,
-  Response,
-  ResponseKeyType,
-  Url,
-} from './types/internal';
-
-/**
- * Inner key for request type.
- */
-declare const REQUEST_KEY: RequestKeyType;
-
-/**
- * Inner key for response type.
- */
-declare const RESPONSE_KEY: ResponseKeyType;
+import type {Method, Request, Response, Url} from './types/internal';
 
 /**
  * Abstract route for API requests.
@@ -30,12 +13,14 @@ export abstract class ApiRoute<
   /**
    * Request type of API route.
    */
-  declare readonly [REQUEST_KEY]: SomeRequest;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  declare readonly __REQUEST_KEY: SomeRequest;
 
   /**
    * Response type of API route.
    */
-  declare readonly [RESPONSE_KEY]: SomeResponse;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  declare readonly __RESPONSE_KEY: SomeResponse;
 
   /**
    * Returns `true`, if the request body is in JSON format.
diff --git a/src/Page.ts b/src/Page.ts
index 96431674..9c072029 100644
--- a/src/Page.ts
+++ b/src/Page.ts
@@ -7,12 +7,7 @@ import {reloadDocument} from './utils/document';
 import {getPlaywrightPage} from './useContext';
 
 import type {PageRoute} from './PageRoute';
-import type {AsyncVoid, PageClassTypeArgs, ParamsKeyType, Url} from './types/internal';
-
-/**
- * Inner key for parameters type.
- */
-declare const PARAMS_KEY: ParamsKeyType;
+import type {AsyncVoid, PageClassTypeArgs, Url} from './types/internal';
 
 /**
  * Abstract page with base methods.
@@ -21,7 +16,8 @@ export abstract class Page<PageParams = undefined> {
   /**
    * Type of page parameters.
    */
-  declare readonly [PARAMS_KEY]: PageParams;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  declare readonly __PARAMS_KEY: PageParams;
 
   /**
    * Default maximum interval (in milliseconds) between requests.
diff --git a/src/Route.ts b/src/Route.ts
index 70f8fcb2..e44c4094 100644
--- a/src/Route.ts
+++ b/src/Route.ts
@@ -1,8 +1,6 @@
 import {SLASHES_AT_THE_END_REGEXP, SLASHES_AT_THE_START_REGEXP} from './constants/internal';
 
-import type {Method, ParamsKeyType, Url, ZeroOrOneArg} from './types/internal';
-
-declare const PARAMS_KEY: ParamsKeyType;
+import type {Method, Url, ZeroOrOneArg} from './types/internal';
 
 /**
  * Abstract route with base methods.
@@ -11,7 +9,8 @@ export abstract class Route<RouteParams> {
   /**
    * Type of route parameters.
    */
-  declare readonly [PARAMS_KEY]: RouteParams;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  declare readonly __PARAMS_KEY: RouteParams;
 
   /**
    * Immutable route parameters.
diff --git a/src/actions/index.ts b/src/actions/index.ts
index 8c705213..2c57ce06 100644
--- a/src/actions/index.ts
+++ b/src/actions/index.ts
@@ -32,6 +32,7 @@ export {pressKey} from './pressKey';
 export {resizeWindow} from './resizeWindow';
 export {scroll} from './scroll';
 export {scrollIntoView} from './scrollIntoView';
+export {selectOption} from './selectOption';
 export {selectText} from './selectText';
 export {setCookies} from './setCookies';
 export {setFilesToUpload} from './setFilesToUpload';
diff --git a/src/actions/selectOption.ts b/src/actions/selectOption.ts
new file mode 100644
index 00000000..918bc360
--- /dev/null
+++ b/src/actions/selectOption.ts
@@ -0,0 +1,29 @@
+import {LogEventType} from '../constants/internal';
+import {log} from '../utils/log';
+import {getDescriptionFromSelector} from '../utils/selectors';
+
+import type {Locator} from '@playwright/test';
+
+import type {Selector} from '../types/internal';
+
+type Options = Parameters<Locator['selectOption']>[1];
+
+/**
+ * Selects an `option` in `select` element.
+ */
+export const selectOption = async (
+  selector: Selector,
+  value: string | readonly string[],
+  options: Options = {},
+): Promise<void> => {
+  const description = getDescriptionFromSelector(selector);
+  const withDescription = description !== undefined ? ` with description ${description}` : '';
+
+  log(
+    `Select an option with value "${String(value)}" in <select> element${withDescription}`,
+    options,
+    LogEventType.InternalAction,
+  );
+
+  await selector.getPlaywrightLocator().selectOption(value, options);
+};
diff --git a/src/config.ts b/src/config.ts
index 850754cc..3078e746 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -93,7 +93,7 @@ if (isDebug || isUiMode) {
 }
 
 const useOptions: PlaywrightTestConfig['use'] = {
-  actionTimeout: userlandPack.testIdleTimeout,
+  actionTimeout: Math.round(userlandPack.testIdleTimeout / 2),
   browserName: userlandPack.browserName,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   bypassCSP: !userlandPack.enableCsp,
diff --git a/src/configurator/runEnvironment.ts b/src/configurator/runEnvironment.ts
index 3a0b548c..168f6e3c 100644
--- a/src/configurator/runEnvironment.ts
+++ b/src/configurator/runEnvironment.ts
@@ -7,17 +7,18 @@ import {RunEnvironment} from './constants';
 /**
  * Run environment for current e2ed run.
  */
-export let runEnvironment = e2edEnvironment[RUN_ENVIRONMENT_VARIABLE_NAME] ?? RunEnvironment.Local;
+export let runEnvironment: RunEnvironment =
+  e2edEnvironment[RUN_ENVIRONMENT_VARIABLE_NAME] ?? RunEnvironment.Local;
 
 /**
  * `true`, if run e2ed in docker environment, and `false` otherwise.
  */
-export let isDockerRun = runEnvironment === RunEnvironment.Docker;
+export let isDockerRun: boolean = runEnvironment === RunEnvironment.Docker;
 
 /**
  * `true`, if run e2ed in local environment, and `false` otherwise.
  */
-export let isLocalRun = runEnvironment === RunEnvironment.Local;
+export let isLocalRun: boolean = runEnvironment === RunEnvironment.Local;
 
 /**
  * Set current run environment before e2ed start.
diff --git a/src/constants/environment.ts b/src/constants/environment.ts
index 8f664147..90c2c7c7 100644
--- a/src/constants/environment.ts
+++ b/src/constants/environment.ts
@@ -9,7 +9,7 @@ export const e2edEnvironment = process.env as E2edEnvironment;
 /**
  * `true` if e2ed run in debug mode, and `false` otherwise.
  */
-export const isDebug = Boolean(e2edEnvironment.E2ED_DEBUG);
+export const isDebug: boolean = Boolean(e2edEnvironment.E2ED_DEBUG);
 
 /**
  * Name of e2ed environment variable with path to pack.
diff --git a/src/constants/pages.ts b/src/constants/pages.ts
index 116eb4e0..a793c80b 100644
--- a/src/constants/pages.ts
+++ b/src/constants/pages.ts
@@ -1,4 +1,4 @@
 /**
  * Unique token for creating page instances.
  */
-export const CREATE_PAGE_TOKEN = Symbol('e2ed:CREATE_PAGE_TOKEN');
+export const CREATE_PAGE_TOKEN: symbol = Symbol('e2ed:CREATE_PAGE_TOKEN');
diff --git a/src/constants/selector.ts b/src/constants/selector.ts
index e5e62bad..81723606 100644
--- a/src/constants/selector.ts
+++ b/src/constants/selector.ts
@@ -1,10 +1,10 @@
 /**
  * Key for string description of Selector.
  */
-export const DESCRIPTION_KEY = Symbol.for('e2ed:DESCRIPTION_KEY');
+export const DESCRIPTION_KEY: unique symbol = Symbol.for('e2ed:DESCRIPTION_KEY');
 
 /**
  * Key for retrying of Selector properties.
  * @internal
  */
-export const RETRY_KEY = Symbol.for('e2ed:RETRY_KEY');
+export const RETRY_KEY: unique symbol = Symbol.for('e2ed:RETRY_KEY');
diff --git a/src/constants/url.ts b/src/constants/url.ts
index c77d52b3..a27ab825 100644
--- a/src/constants/url.ts
+++ b/src/constants/url.ts
@@ -1,14 +1,14 @@
 /**
  * Regexp that accept any url.
  */
-export const ANY_URL_REGEXP = /.*/;
+export const ANY_URL_REGEXP: RegExp = /.*/;
 
 /**
  * Regexp that matches all slashes at the end of a line.
  */
-export const SLASHES_AT_THE_END_REGEXP = /\/+$/;
+export const SLASHES_AT_THE_END_REGEXP: RegExp = /\/+$/;
 
 /**
  * Regexp that matches all slashes at the start of a line.
  */
-export const SLASHES_AT_THE_START_REGEXP = /^\/+/;
+export const SLASHES_AT_THE_START_REGEXP: RegExp = /^\/+/;
diff --git a/src/context/frameContext.ts b/src/context/frameContext.ts
index 8249919a..63f30e9d 100644
--- a/src/context/frameContext.ts
+++ b/src/context/frameContext.ts
@@ -1,8 +1,20 @@
-import {useContext} from '../useContext';
+import {type ClearContext, type GetContext, type SetContext, useContext} from '../useContext';
 
 import type {FrameLocator} from '@playwright/test';
 
+const [get, set, clear] = useContext<FrameLocator>();
+
+/**
+ * Get frame context.
+ */
+export const getFrameContext: GetContext<FrameLocator> = get;
+
+/**
+ * Set frame context.
+ */
+export const setFrameContext: SetContext<FrameLocator> = set;
+
 /**
- * Get, set and clear frame context.
+ * Clear frame context.
  */
-export const [getFrameContext, setFrameContext, clearFrameContext] = useContext<FrameLocator>();
+export const clearFrameContext: ClearContext = clear;
diff --git a/src/selectors/createSelectorFunction.ts b/src/selectors/createSelectorFunction.ts
new file mode 100644
index 00000000..4e94dcae
--- /dev/null
+++ b/src/selectors/createSelectorFunction.ts
@@ -0,0 +1,19 @@
+import {setCustomInspectOnFunction} from '../utils/fn';
+import {generalLog} from '../utils/generalLog';
+import {createSelectorCreator} from '../utils/selectors';
+
+import type {CreateSelector, CreateSelectorFunctionOptions} from '../types/internal';
+
+/**
+ * Creates `createSelector` function.
+ */
+export const createSelectorFunction = ({
+  getLocatorAttributeName,
+}: CreateSelectorFunctionOptions): CreateSelector => {
+  setCustomInspectOnFunction(getLocatorAttributeName);
+  generalLog('Create selector functions', {getLocatorAttributeName});
+
+  const createSelector = createSelectorCreator(getLocatorAttributeName);
+
+  return createSelector;
+};
diff --git a/src/selectors/createSelectorFunctions.ts b/src/selectors/createSelectorFunctions.ts
deleted file mode 100644
index d1620dc8..00000000
--- a/src/selectors/createSelectorFunctions.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import {setCustomInspectOnFunction} from '../utils/fn';
-import {generalLog} from '../utils/generalLog';
-import {
-  createSelectorByCssCreator,
-  createSelectorCreator,
-  htmlElementSelectorCreator,
-} from '../utils/selectors';
-
-import type {CreateSelectorFunctionsOptions, SelectorFunctions} from '../types/internal';
-
-/**
- * Creates main functions for creating selectors and working with selectors.
- */
-export const createSelectorFunctions = ({
-  getLocatorAttributeName,
-}: CreateSelectorFunctionsOptions): SelectorFunctions => {
-  setCustomInspectOnFunction(getLocatorAttributeName);
-  generalLog('Create selector functions', {getLocatorAttributeName});
-
-  const createSelector = createSelectorCreator(getLocatorAttributeName);
-
-  return {
-    /**
-     * Creates selector by locator and optional parameters.
-     */
-    createSelector,
-    /**
-     * Creates selector of page elements by CSS selector.
-     */
-    createSelectorByCss: createSelectorByCssCreator(createSelector),
-    /**
-     * Selector of page HTML element ("documentElement").
-     */
-    htmlElementSelector: htmlElementSelectorCreator(createSelector),
-  };
-};
diff --git a/src/selectors/index.ts b/src/selectors/index.ts
index 8286c429..26b2b468 100644
--- a/src/selectors/index.ts
+++ b/src/selectors/index.ts
@@ -1 +1 @@
-export {createSelectorFunctions} from './createSelectorFunctions';
+export {createSelectorFunction} from './createSelectorFunction';
diff --git a/src/types/http/index.ts b/src/types/http/index.ts
index 78f9ee7d..18933f2b 100644
--- a/src/types/http/index.ts
+++ b/src/types/http/index.ts
@@ -13,5 +13,4 @@ export type {
   StringHeaders,
   Url,
 } from './http';
-export type {RequestKeyType, ResponseKeyType} from './internalKeys';
 export type {StatusCode} from './statusCode';
diff --git a/src/types/http/internalKeys.ts b/src/types/http/internalKeys.ts
deleted file mode 100644
index bfabbcc9..00000000
--- a/src/types/http/internalKeys.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Inner key for request type.
- */
-declare const REQUEST_KEY: unique symbol;
-
-/**
- * Inner key for response type.
- */
-declare const RESPONSE_KEY: unique symbol;
-
-/**
- * Type of inner key for request type.
- */
-export type RequestKeyType = typeof REQUEST_KEY;
-
-/**
- * Type of inner key for response type.
- */
-export type ResponseKeyType = typeof RESPONSE_KEY;
diff --git a/src/types/index.ts b/src/types/index.ts
index 887c9e12..87d72b4b 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,3 +1,4 @@
+export type {ClearContext, GetContext, GetWithDefaultValueContext, SetContext} from '../useContext';
 export type {Brand, IsBrand} from './brand';
 export type {Expect, IsEqual, IsReadonlyKey} from './checks';
 export type {Class} from './class';
@@ -56,11 +57,9 @@ export type {LiteReport, LiteRetry} from './report';
 export type {ApiRouteClassType, ApiRouteClassTypeWithGetParamsFromUrl} from './routes';
 export type {
   CreateSelector,
-  CreateSelectorByCss,
-  CreateSelectorFunctionsOptions,
+  CreateSelectorFunctionOptions,
   GetLocatorAttributeNameFn,
   Selector,
-  SelectorFunctions,
 } from './selectors';
 export type {StackFrame} from './stackTrace';
 export type {PackageInfo, StartInfo} from './startInfo';
diff --git a/src/types/internal.ts b/src/types/internal.ts
index 4502c5a6..9bc167c9 100644
--- a/src/types/internal.ts
+++ b/src/types/internal.ts
@@ -48,10 +48,8 @@ export type {
   Method,
   Query,
   Request,
-  RequestKeyType,
   RequestWithUtcTimeInMs,
   Response,
-  ResponseKeyType,
   ResponseWithRequest,
   SameSite,
   SetCookieHeaderString,
@@ -113,12 +111,10 @@ export type {RunLabel, RunLabelObject} from './runLabel';
 export type {RawRunLabelObject} from './runLabel';
 export type {
   CreateSelector,
-  CreateSelectorByCss,
-  CreateSelectorFunctionsOptions,
+  CreateSelectorFunctionOptions,
   GetLocatorAttributeNameFn,
   Selector,
   SelectorCustomMethods,
-  SelectorFunctions,
 } from './selectors';
 /** @internal */
 export type {SelectorPropertyRetryData} from './selectors';
@@ -163,7 +159,6 @@ export type {
   Normalize,
   ObjectEntries,
   OptionalIfValueIncludeDefault,
-  ParamsKeyType,
   UnionToIntersection,
   UnwrapSet,
   Values,
diff --git a/src/types/selectors.ts b/src/types/selectors.ts
index c964b4ed..ec45f74f 100644
--- a/src/types/selectors.ts
+++ b/src/types/selectors.ts
@@ -42,9 +42,9 @@ type ReplaceObjectSelectors<Obj extends object> = Readonly<{
 }>;
 
 /**
- * Options of `createSelectorFunctions` function.
+ * Options of `createSelectorFunction` function.
  */
-export type CreateSelectorFunctionsOptions = Readonly<{
+export type CreateSelectorFunctionOptions = Readonly<{
   getLocatorAttributeName: GetLocatorAttributeNameFn;
 }>;
 
@@ -58,11 +58,6 @@ export type GetLocatorAttributeNameFn = (this: void, parameter: string) => strin
  */
 export type CreateSelector = (this: void, cssString: string) => Selector;
 
-/**
- * Type of `createSelectorByCss` function.
- */
-export type CreateSelectorByCss = (this: void, cssSelectorString: string) => Selector;
-
 /**
  * Selector type (which replaces the DOM element wrapper).
  */
@@ -106,15 +101,6 @@ export type SelectorCustomMethods = Readonly<{
   hasLocatorParameter: (this: SelectorClass, parameter: string) => Promise<boolean>;
 }>;
 
-/**
- * Object with main functions for creating selectors and working with selectors.
- */
-export type SelectorFunctions = Readonly<{
-  createSelector: CreateSelector;
-  createSelectorByCss: CreateSelectorByCss;
-  htmlElementSelector: Selector;
-}>;
-
 /**
  * Data for retrying property of Selector.
  * @internal
diff --git a/src/types/userland/createPackSpecificTypes.ts b/src/types/userland/createPackSpecificTypes.ts
index 6cab5beb..3fc8383a 100644
--- a/src/types/userland/createPackSpecificTypes.ts
+++ b/src/types/userland/createPackSpecificTypes.ts
@@ -2,6 +2,7 @@ import type {AnyPack, AnyPackParameters, FullPackConfigByPack, GetPackParameters
 import type {FullMocksConfig} from '../fullMocks';
 import type {MapBackendResponseToLog, MapLogPayload, MapLogPayloadInReport} from '../log';
 import type {LiteReport} from '../report';
+import type {TestFunction} from '../testRun';
 
 import type {UserlandHooks} from './userlandHooks';
 
@@ -34,4 +35,5 @@ export type CreatePackSpecificTypes<
   MapLogPayloadInConsole: MapLogPayload;
   MapLogPayloadInLogFile: MapLogPayload;
   MapLogPayloadInReport: MapLogPayloadInReport;
+  TestFunction: TestFunction<PackParameters['TestMeta']>;
 }>;
diff --git a/src/types/utils.ts b/src/types/utils.ts
index 46bf6c42..7b33f46e 100644
--- a/src/types/utils.ts
+++ b/src/types/utils.ts
@@ -1,11 +1,6 @@
 import type {IsBrand} from './brand';
 import type {IsIncludeUndefined} from './undefined';
 
-/**
- * Inner key for params type.
- */
-declare const PARAMS_KEY: unique symbol;
-
 /**
  * Entry pair that `Object.entries<Type>` returns.
  */
@@ -20,8 +15,8 @@ export type Any = any;
 /**
  * Returns the type of instance params.
  */
-export type GetParamsType<Class> = Class extends {[PARAMS_KEY]: unknown}
-  ? Normalize<Class[ParamsKeyType]>
+export type GetParamsType<Class> = Class extends {['__PARAMS_KEY']: unknown}
+  ? Normalize<Class['__PARAMS_KEY']>
   : never;
 
 /**
@@ -80,11 +75,6 @@ export type OptionalIfValueIncludeDefault<
   DefaultValue,
 > = DefaultValue extends Value ? {[K in Key]?: Value} : {[K in Key]: Value};
 
-/**
- * Type of inner key for params type.
- */
-export type ParamsKeyType = typeof PARAMS_KEY;
-
 /**
  * Takes a union, and returns the intersection of the elements of the union.
  * `UnionToIntersection<((x: string) => number) | ((x: number) => string)>` =
diff --git a/src/useContext/index.ts b/src/useContext/index.ts
index 97e80bfd..c012f168 100644
--- a/src/useContext/index.ts
+++ b/src/useContext/index.ts
@@ -1,4 +1,10 @@
 export {getPlaywrightPage} from './page';
 /** @internal */
 export {pageStorage} from './page';
+export type {
+  Clear as ClearContext,
+  Get as GetContext,
+  GetWithDefaultValue as GetWithDefaultValueContext,
+  Set as SetContext,
+} from './types';
 export {useContext} from './useContext';
diff --git a/src/useContext/types.ts b/src/useContext/types.ts
new file mode 100644
index 00000000..27ef1d15
--- /dev/null
+++ b/src/useContext/types.ts
@@ -0,0 +1,19 @@
+/**
+ * `Clear` context function.
+ */
+export type Clear = (this: void) => void;
+
+/**
+ * Get value from context.
+ */
+export type Get<Type> = (this: void) => Type | undefined;
+
+/**
+ * Get value from context with default value.
+ */
+export type GetWithDefaultValue<Type> = (this: void) => Type;
+
+/**
+ * Set value to context.
+ */
+export type Set<Type> = (this: void, value: Type) => void;
diff --git a/src/useContext/useContext.ts b/src/useContext/useContext.ts
index fd017e8b..f1ae4265 100644
--- a/src/useContext/useContext.ts
+++ b/src/useContext/useContext.ts
@@ -2,15 +2,12 @@ import {getPlaywrightPage} from './page';
 
 import type {Page} from '@playwright/test';
 
+import type {Clear, Get, GetWithDefaultValue, Set} from './types';
+
 type Context<Type> = {contexts: Record<number, Type>};
 
 type PageWithCtx = Page & {ctx?: object};
 
-type Get<Type> = (this: void) => Type | undefined;
-type GetWithDefaultValue<Type> = (this: void) => Type;
-type Set<Type> = (this: void, value: Type) => void;
-type Clear = (this: void) => void;
-
 type UseContext = (<Type>() => [get: Get<Type>, set: Set<Type>, clear: Clear]) &
   (<Type>(defaultValue: Type) => [get: GetWithDefaultValue<Type>, set: Set<Type>, clear: Clear]);
 
diff --git a/src/utils/error/E2edError.ts b/src/utils/error/E2edError.ts
index e639b927..3915cb8a 100644
--- a/src/utils/error/E2edError.ts
+++ b/src/utils/error/E2edError.ts
@@ -19,7 +19,7 @@ import type {
 /**
  * Extended Error class for e2ed.
  */
-export class E2edError extends Error {
+class E2edError extends Error {
   /**
    * Error message.
    */
@@ -72,13 +72,6 @@ export class E2edError extends Error {
     this.utcTimeInMs = utcTimeInMs;
   }
 
-  /**
-   * Custom presentation of error for `nodejs` `inspect`.
-   */
-  [inspect.custom](): string {
-    return this.toString();
-  }
-
   /**
    * Custom JSON presentation of error.
    */
@@ -97,3 +90,13 @@ export class E2edError extends Error {
     return `E2edError ${printedString}`;
   }
 }
+
+/**
+ * Custom presentation of error for `nodejs` `inspect`.
+ */
+// eslint-disable-next-line no-restricted-syntax
+E2edError.prototype[inspect.custom as unknown as 'toString'] = function custom(): string {
+  return this.toString();
+};
+
+export {E2edError};
diff --git a/src/utils/expect/types.ts b/src/utils/expect/types.ts
index 3869e7b0..bb91ef47 100644
--- a/src/utils/expect/types.ts
+++ b/src/utils/expect/types.ts
@@ -58,5 +58,5 @@ export type ExpectMethod = (this: Expect, ...args: readonly unknown[]) => Promis
 /**
  * All matchers.
  */
-// TODO: support LocatorAssertions, is Actual is a Selector
+// TODO: support LocatorAssertions, if Actual is a Selector
 export type Matchers<Actual> = AdditionalMatchers<Actual> & ReturnType<PlaywrightExpect>;
diff --git a/src/utils/http/getContentJsonHeaders.ts b/src/utils/http/getContentJsonHeaders.ts
index 94ce7456..bbdab291 100644
--- a/src/utils/http/getContentJsonHeaders.ts
+++ b/src/utils/http/getContentJsonHeaders.ts
@@ -1,8 +1,9 @@
 /**
  * Get Content-Length and Content-Type headers for JSON body.
  */
-export const getContentJsonHeaders = (bodyAsString: string | undefined) =>
-  ({
-    'content-length': String(Buffer.byteLength(bodyAsString ?? '')),
-    'content-type': 'application/json; charset=UTF-8',
-  }) as const;
+export const getContentJsonHeaders = (
+  bodyAsString: string | undefined,
+): Readonly<{'content-length': string; 'content-type': 'application/json; charset=UTF-8'}> => ({
+  'content-length': String(Buffer.byteLength(bodyAsString ?? '')),
+  'content-type': 'application/json; charset=UTF-8',
+});
diff --git a/src/utils/selectors/Selector.ts b/src/utils/selectors/Selector.ts
index a7e9d892..88326f64 100644
--- a/src/utils/selectors/Selector.ts
+++ b/src/utils/selectors/Selector.ts
@@ -26,7 +26,7 @@ function toJSON(this: object): string {
 export class Selector {
   readonly cssString: string;
 
-  private args?: readonly (number | string)[];
+  private args?: readonly (RegExp | number | string)[];
 
   private kind: 'css' | 'filter' | 'find' | 'nth' | 'parent' | 'withText';
 
@@ -194,7 +194,7 @@ export class Selector {
         return selector.getPlaywrightLocator().locator('xpath=..');
 
       case 'withText':
-        return selector.getPlaywrightLocator().filter({hasText: String(args[0])});
+        return selector.getPlaywrightLocator().filter({hasText: args[0] as RegExp | string});
 
       // no default
     }
@@ -240,10 +240,10 @@ export class Selector {
     return selector;
   }
 
-  withText(text: string): Selector {
+  withText(textOrRegExp: RegExp | string): Selector {
     const selector = new Selector(this.cssString);
 
-    selector.args = [text];
+    selector.args = [textOrRegExp];
     selector.kind = 'withText';
     selector.parentSelector = this;
 
diff --git a/src/utils/selectors/createSelectorByCssCreator.ts b/src/utils/selectors/createSelectorByCssCreator.ts
deleted file mode 100644
index 094c1b13..00000000
--- a/src/utils/selectors/createSelectorByCssCreator.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type {CreateSelector, CreateSelectorByCss, Selector} from '../../types/internal';
-
-/**
- * Creates `createSelectorByCss` function.
- * @internal
- */
-export const createSelectorByCssCreator = (createSelector: CreateSelector): CreateSelectorByCss => {
-  /**
-   * Creates selector of page elements by CSS selector.
-   */
-  const createSelectorByCss = (cssSelectorString: string): Selector =>
-    createSelector(cssSelectorString);
-
-  return createSelectorByCss;
-};
diff --git a/src/utils/selectors/htmlElementSelectorCreator.ts b/src/utils/selectors/htmlElementSelectorCreator.ts
deleted file mode 100644
index 2961c772..00000000
--- a/src/utils/selectors/htmlElementSelectorCreator.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {CreateSelector, Selector} from '../../types/internal';
-
-/**
- * Creates selector of page HTML element ("documentElement").
- * @internal
- */
-export const htmlElementSelectorCreator = (createSelector: CreateSelector): Selector =>
-  createSelector('html');
diff --git a/src/utils/selectors/index.ts b/src/utils/selectors/index.ts
index 5ecbe17b..302c6237 100644
--- a/src/utils/selectors/index.ts
+++ b/src/utils/selectors/index.ts
@@ -1,8 +1,4 @@
 /** @internal */
 export {createSelectorCreator} from './createSelectorCreator';
-/** @internal */
-export {createSelectorByCssCreator} from './createSelectorByCssCreator';
 export {getDescriptionFromSelector} from './getDescriptionFromSelector';
-/** @internal */
-export {htmlElementSelectorCreator} from './htmlElementSelectorCreator';
 export {Selector} from './Selector';
diff --git a/src/utils/uiMode/fixSourceCode.ts b/src/utils/uiMode/fixSourceCode.ts
index 21a81fbe..01c10b8b 100644
--- a/src/utils/uiMode/fixSourceCode.ts
+++ b/src/utils/uiMode/fixSourceCode.ts
@@ -66,7 +66,15 @@ if (isUiMode) {
 
   setReadonlyProperty(Error, 'prototype', OriginalError.prototype);
 
-  globalThis.Error.prototype.constructor = Error;
+  Object.assign(globalThis.Error.prototype, {
+    browserLogMessage() {
+      return '';
+    },
+    constructor: Error,
+    setMessage(this: {message: string}, message: string) {
+      this.message = message;
+    },
+  });
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
   Error.captureStackTrace = OriginalError.captureStackTrace;
diff --git a/src/utils/uiMode/uiMode.ts b/src/utils/uiMode/uiMode.ts
index b92fdbaf..662c3611 100644
--- a/src/utils/uiMode/uiMode.ts
+++ b/src/utils/uiMode/uiMode.ts
@@ -6,7 +6,7 @@ import {assertValueIsFalse} from '../asserts';
  * `true` if e2ed run in UI mode, and `false` otherwise.
  */
 // eslint-disable-next-line import/no-mutable-exports
-export let isUiMode = Boolean(e2edEnvironment[UI_MODE_VARIABLE_NAME]);
+export let isUiMode: boolean = Boolean(e2edEnvironment[UI_MODE_VARIABLE_NAME]);
 
 /**
  * Set current run environment before e2ed start.
diff --git a/src/utils/valueToString/getStringTrimmedToMaxLength.ts b/src/utils/valueToString/getStringTrimmedToMaxLength.ts
index 45bb6cac..c4e4b161 100644
--- a/src/utils/valueToString/getStringTrimmedToMaxLength.ts
+++ b/src/utils/valueToString/getStringTrimmedToMaxLength.ts
@@ -5,7 +5,7 @@ import {MAX_STRING_LENGTH_IN_PRINTED_VALUE} from '../../constants/internal';
  */
 export const getStringTrimmedToMaxLength = (
   text: string,
-  maxStringLength = MAX_STRING_LENGTH_IN_PRINTED_VALUE,
+  maxStringLength: number = MAX_STRING_LENGTH_IN_PRINTED_VALUE,
 ): string => {
   if (text.length <= maxStringLength) {
     return text;
diff --git a/tsconfig.json b/tsconfig.json
index 2e9ef3bd..9a484543 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,6 +7,7 @@
     "esModuleInterop": true,
     "exactOptionalPropertyTypes": true,
     "incremental": true,
+    "isolatedDeclarations": true,
     "module": "CommonJS",
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,