diff --git a/README.md b/README.md
index 86e56c0..1fca8e0 100644
--- a/README.md
+++ b/README.md
@@ -22,22 +22,25 @@ sudo dnf install -y tmt+all
 ## If not provided create koji build and set env variable
 you can use the following allias to create build and set env automatically:
 ```bash
-alias scratchbuild='function _scratchbuild() { \
-  SRC_RPM=$(ls *.src.rpm | head -n 1); \
+
+alias scratchbuild='set -x; \
+  SRC_RPM=$(ls *.src.rpm | head -n 1) && \
+  echo "Found source RPM: $SRC_RPM" && \
   if [ -z "$SRC_RPM" ]; then \
-    echo "No source RPM file found in the current directory."; \
+    echo "No source RPM file found."; \
     return 1; \
-  fi; \
-  BUILD_OUTPUT=$(koji build --scratch rawhide $SRC_RPM 2>&1); \
-  KOJI_TASK_ID=$(echo "$BUILD_OUTPUT" | grep -oP "(?<=Task ID: )[0-9]+"); \
-  if [[ -n $KOJI_TASK_ID ]]; then \
-    export KOJI_TASK_ID=$KOJI_TASK_ID; \
-    echo "Scratch build completed. Task ID: $KOJI_TASK_ID"; \
+  fi && \
+  BUILD_OUTPUT=$(koji build --scratch rawhide $SRC_RPM 2>&1) && \
+  echo "Koji build output: $BUILD_OUTPUT" && \
+  KOJI_TASK_ID=$(echo "$BUILD_OUTPUT" | grep -oP "(?<=Task ID: )[0-9]+") && \
+  if [ -n "$KOJI_TASK_ID" ]; then \
+    export KOJI_TASK_ID="$KOJI_TASK_ID"; \
+    echo "Scratch build started. Task ID: $KOJI_TASK_ID"; \
   else \
-    echo "Failed to extract Task ID."; \
+    echo "Failed to extract Task ID. Build output: $BUILD_OUTPUT"; \
     return 1; \
   fi; \
-}; _scratchbuild'
+  set +x'
 ```
 
 check what test plans and sub plans are available: 
diff --git a/Smoke/nodejs-sqlite/main.fmf b/Smoke/nodejs-sqlite/main.fmf
new file mode 100644
index 0000000..61f3067
--- /dev/null
+++ b/Smoke/nodejs-sqlite/main.fmf
@@ -0,0 +1,18 @@
+summary: Test to insure sqlite module works properly
+test: ./runtest.sh
+framework: beakerlib
+description: |
+  Nodejs update has introduced the usage of sqlite sessions,
+  this test verifies the ability of nodejs to use this.
+duration: 5m
+require:
+   - nodejs
+#  - type: file
+#    pattern:
+#      - /template.file
+contact:
+  - tjuhasz@redhat.com
+  - aradchen@redhat.com
+tag: smoke
+component:
+  - nodejs
diff --git a/Smoke/nodejs-sqlite/runtest.sh b/Smoke/nodejs-sqlite/runtest.sh
new file mode 100755
index 0000000..6ed4035
--- /dev/null
+++ b/Smoke/nodejs-sqlite/runtest.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Author: Tomas Juhasz <tjuhasz@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2013 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+SQLITE_TEST_SCRIPT='test-sqlite.js'  # Name of the SQLite test script
+#Expected values
+EXPECTED_SUBSTRING_B="{ key: 1, value: 'hello' }"
+EXPECTED_SUBSTRING_S="Test Passed"
+#Script Files
+SQLITE_TEST_SCRIPT='sqlite.js'  
+SQLITE_TEST_SCRIPT_SESSION='sqlite-sessions.js'  
+	
+NODEJS=${NODEJS:-node}
+NPMJS=${NPMJS:-npm}
+rlJournalStart
+    rlPhaseStartSetup
+        #Push everything into temp directory
+        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
+        rlRun "cp $SQLITE_TEST_SCRIPT \$tmp/$SQLITE_TEST_SCRIPT"
+        rlRun "cp $SQLITE_TEST_SCRIPT_SESSION \$tmp/$SQLITE_TEST_SCRIPT_SESSION"
+        rlRun "pushd \$tmp"
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        rlLogInfo "Running SQLite test script"
+        rlRun "$NPMJS install sqlite"
+        rlRun "$NODEJS --experimental-sqlite $SQLITE_TEST_SCRIPT > output.txt" 0 "Execute Node.js SQLite test script"
+        OUTPUT=$(cat output.txt)
+        #Run just a standart script using sqlite
+        rlAssertGrep "$EXPECTED_SUBSTRING_B" output.txt
+        rlRun "$NODEJS --experimental-sqlite $SQLITE_TEST_SCRIPT_SESSION > output_session.txt" 0 "Execute Node.js SQLite test script"
+        OUTPUT=$(cat output_session.txt)
+        #Run script using sqlite which utilizes the session feature
+        rlAssertGrep "$EXPECTED_SUBSTRING_S" output_session.txt
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlLogInfo "Cleaning up test environment"
+        rlRun "$NPMJS remove sqlite"
+        rlRun "rm -r *"
+        rlRun "popd"
+        rlRun "rm -r \$tmp" 0 "Remove tmp directory"
+    rlPhaseEnd
+
+rlJournalEnd
+
diff --git a/Smoke/nodejs-sqlite/sqlite-sessions.js b/Smoke/nodejs-sqlite/sqlite-sessions.js
new file mode 100644
index 0000000..44a4105
--- /dev/null
+++ b/Smoke/nodejs-sqlite/sqlite-sessions.js
@@ -0,0 +1,34 @@
+import { DatabaseSync } from 'node:sqlite';
+
+const sourceDb = new DatabaseSync(':memory:');
+const targetDb = new DatabaseSync(':memory:');
+
+sourceDb.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
+targetDb.exec('CREATE TABLE data(key INTEGER PRIMARY KEY, value TEXT)');
+
+const session = sourceDb.createSession();
+
+try {
+  const insert = sourceDb.prepare('INSERT INTO data (key, value) VALUES (?, ?)');
+  insert.run(1, 'hello');
+  insert.run(2, 'world');
+
+  const changeset = session.changeset();
+
+  targetDb.applyChangeset(changeset);
+
+  const sourceData = sourceDb.prepare('SELECT * FROM data ORDER BY key').all();
+  const targetData = targetDb.prepare('SELECT * FROM data ORDER BY key').all();
+
+  console.log('Source Data:', sourceData);
+  console.log('Target Data:', targetData);
+
+  if (JSON.stringify(sourceData) === JSON.stringify(targetData)) {
+    console.log('Test Passed: Changes were successfully applied to the target database');
+  } else {
+    console.log('Test Failed: Data mismatch between source and target databases');
+  }
+} finally {
+  session.close();
+}
+
diff --git a/Smoke/nodejs-sqlite/sqlite.js b/Smoke/nodejs-sqlite/sqlite.js
new file mode 100644
index 0000000..1298809
--- /dev/null
+++ b/Smoke/nodejs-sqlite/sqlite.js
@@ -0,0 +1,16 @@
+const { DatabaseSync } = require('node:sqlite');
+const database = new DatabaseSync(':memory:');
+
+database.exec(`
+  CREATE TABLE data(
+    key INTEGER PRIMARY KEY,
+    value TEXT
+  ) STRICT
+`);
+const insert = database.prepare('INSERT INTO data (key, value) VALUES (?, ?)');
+
+insert.run(1, 'hello');
+insert.run(2, 'world');
+const query = database.prepare('SELECT * FROM data ORDER BY key');
+
+console.log(query.all());
diff --git a/install-rpms.sh b/install-rpms.sh
index e9e557a..f238964 100755
--- a/install-rpms.sh
+++ b/install-rpms.sh
@@ -1,64 +1,45 @@
 #!/bin/bash
-
-set -e  # Exit immediately on any command failure
-set -u  # Treat unset variables as errors
-
-# Manual way to test any task or build locally
-#KOJI_TASK_ID=2586515
-
-KOJI_TASK_ID=${KOJI_TASK_ID:-}  # Use environment variable or default to an empty string
+#KOJI_TASK_ID=2596437
+KOJI_TASK_ID=${KOJI_TASK_ID:-}  # Use the environment variable, or an empty string if not set
 
 # Check if KOJI_TASK_ID is set
-if [ -z "$KOJI_TASK_ID" ]; then
+[ -n "$KOJI_TASK_ID" ] || {
   echo "WARN: KOJI_TASK_ID not set!"
-  echo "WARN: RPMS will be pulled from the repo as fallback." >&2
-  echo "INFO: This variable should be either provided or passed from Testing Farm." >&2
+  echo "WARN: not able to find scratch build, RPMS will be pulled from repo" >&2
+  echo "WARN: this variable should be either provided or passed from Testing Farm" >&2
   exit 0
-fi
+}
+
 
 # Get the current architecture
 ARCH=$(uname -m)
-echo "INFO: Detected architecture: $ARCH"
 
-# Function to download build using `koji download-build` with progress
-download_with_koji_build() {
-  echo "INFO: Attempting to download build for task ID $KOJI_TASK_ID using 'koji download-build'."
-  koji download-build --arch "$ARCH" "$KOJI_TASK_ID"
+# Download the build for the current architecture
+koji download-build $KOJI_TASK_ID --arch=$ARCH || {
+  echo "Failed to download build $KOJI_TASK_ID for architecture $ARCH using koji" >&2
+  exit 1
 }
 
-# Function to download using `koji download-task` as fallback
-download_with_koji_task() {
-  echo "INFO: Attempting to download build for task ID $KOJI_TASK_ID using 'koji download-task'."
-  koji download-task --arch "$ARCH" "$KOJI_TASK_ID"
-}
 
-# Attempt both download methods
-if ! download_with_koji_build && ! download_with_koji_task; then
-  echo "WARN: Failed to download RPMS from task $KOJI_TASK_ID for architecture $ARCH." >&2
-  echo "WARN: Proceeding with fallback mechanism."
-  exit 0
-fi
+#( koji download-build --debuginfo --task-id --arch noarch --arch x86_64 --arch i686 --arch src $KOJI_TASK_ID || koji download-task --arch noarch --arch x86_64 --arch i686 --arch src $KOJI_TASK_ID ) | egrep Downloading | cut -d " " -f 3 | tee rpms-list-$KOJI_TASK_ID
+#ls *[^.src].rpm | sed -r "s/(.*)-.*-.*/\1 \0/" | egrep -v "i686" | awk "{print \$2}" | tee rpms-list
+#dnf -y reinstall $(cat rpms-list) || true
+#if [ ! -z "$(sed 's/\s//g' rpms-list)" ];then dnf -y install --allowerasing $(cat rpms-list);else echo "Nothing to install, rpms-list is empty"; fi
+#if [ ! -z "$(sed 's/\s//g' rpms-list)" ];then sed 's/.rpm$//' rpms-list | xargs -n1 command printf '%q\n' | xargs -d'\n' rpm -q;else echo 'Nothing to verify, rpms-list is empty'; fi
 
-# List downloaded RPMs
-echo "INFO: Listing downloaded RPM files:"
-ls -1 *.rpm || echo "INFO: No RPM files found in the current directory."
-
-# Ensure required RPMs are downloaded
+# Ensure the required RPMs exist
 MAIN_RPM=$(ls nodejs-*.$ARCH.rpm 2>/dev/null | head -n 1)
 DEPENDENCY_RPM=$(ls nodejs-libs-*.$ARCH.rpm 2>/dev/null | head -n 1)
 NPM_RPM=$(ls nodejs-npm-*.$ARCH.rpm 2>/dev/null | head -n 1)
-DEVEL_RPM=$(ls nodejs-devel-*.$ARCH.rpm 2>/dev/null | head -n 1)
 
-if [ -z "$MAIN_RPM" ] || [ -z "$DEPENDENCY_RPM" ] || [ -z "$NPM_RPM" ] || [ -z "$DEVEL_RPM" ]; then
-  echo "WARN: Required RPMs not found for $ARCH architecture. Proceeding without installation." >&2
-  exit 0
+# Check if all necessary RPMs are found
+if [ -z "$MAIN_RPM" ] || [ -z "$DEPENDENCY_RPM" ] || [ -z "$NPM_RPM" ]; then
+    echo "Required RPMs not found for x86_64 architecture." >&2
+    exit 1
 fi
 
-# Install the RPMs
-echo "INFO: Installing RPMs:"
-echo "INFO: $MAIN_RPM, $DEPENDENCY_RPM, $NPM_RPM, $DEVEL_RPM"
-if ! dnf install -y --allowerasing "$MAIN_RPM" "$DEPENDENCY_RPM" "$NPM_RPM" "$DEVEL_RPM"; then
-  echo "WARN: Failed to install some RPMs using DNF. Continuing with tmt require standart installation." >&2
-fi
-
-echo "INFO: Script completed."
+# Install the main package, its dependency, and npm package
+rpm -ivh "$MAIN_RPM" "$DEPENDENCY_RPM" "$NPM_RPM" || {
+    echo "Failed to install RPMs" >&2
+    exit 1
+}
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..eab79c4
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,43 @@
+# Shared metadata
+discover:
+  how: fmf
+execute:
+  how: tmt
+# Will be overwritten by CI
+#environment:
+#  KOJI_BUILD_ID: 123
+provision:
+  how: container
+  image: 'fedora:rawhide'
+prepare:
+- name: Install test deps
+  how: install
+  package:
+  - koji
+  - libuv
+- name: Install fresh packages from Koji
+  how: shell
+  script: ./install-rpms.sh
+
+# Filtering 
+/all:
+ summary: Run all available tests
+  
+/smoke:
+  summary: Run all smoke tests
+  discover:
+    how: fmf
+    filter: "tag:smoke"
+
+/integration:
+  summary: Run all intergraion tests
+  discover:
+    how: fmf
+    filter: "tag: integration"
+
+# Way to test new TCs 
+#/new:
+#  summary: Test new TC
+#  discover:
+#    how: fmf
+#    filter: "tag: new"