diff --git a/README.md b/README.md
index 9d471b76f..80142a41b 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@
     - [Custom filters](#custom-filters)
     - [Custom ranking of proposals](#custom-ranking-of-proposals)
     - [Uploading local images to the provider](#uploading-local-images-to-the-provider)
+    - [Setup and teardown methods](#setup-and-teardown-methods)
   - [Going further](#going-further)
   - [More examples](#more-examples)
   - [Debugging](#debugging)
@@ -356,6 +357,29 @@ const order: MarketOrderSpec = {
 
 [Check the full example](./examples/advanced//local-image/)
 
+### Setup and teardown methods
+
+You can define a setup method that will be executed the first time a provider is rented and a teardown method
+that will be executed before the rental is done. This is useful when you want to avoid doing the same work
+multiple times when running multiple tasks on the same provider.
+
+```ts
+// I want to upload a big file to each provider only once
+const setup: LifecycleFunction = async (exe) => exe.uploadFile("./big-file.txt", "/golem/work/big-file.txt");
+
+// I want to remove the file after I'm done
+const teardown: LifecycleFunction = async (exe) => exe.run("rm /golem/work/big-file.txt");
+
+const pool = await glm.manyOf({
+  order,
+  concurrency,
+  setup,
+  teardown,
+});
+```
+
+[Check the full example](./examples/advanced/setup-and-teardown.ts)
+
 <!--
 TODO:
  ### Market scan
diff --git a/examples/advanced/local-image/serveLocalGvmi.ts b/examples/advanced/local-image/serveLocalGvmi.ts
index 45de3cc64..3c4503539 100644
--- a/examples/advanced/local-image/serveLocalGvmi.ts
+++ b/examples/advanced/local-image/serveLocalGvmi.ts
@@ -39,7 +39,7 @@ const getImagePath = (path: string) => new URL(path, import.meta.url).toString()
       },
     };
 
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     // in our Dockerfile we have created a file called hello.txt, let's read it
     const result = await rental
       .getExeUnit()
diff --git a/examples/advanced/override-module.ts b/examples/advanced/override-module.ts
index 8e7c5fa2d..7ac8f5085 100644
--- a/examples/advanced/override-module.ts
+++ b/examples/advanced/override-module.ts
@@ -58,7 +58,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run("echo Hello, Golem! 👋"))
diff --git a/examples/advanced/payment-filters.ts b/examples/advanced/payment-filters.ts
index 8d5e11e1c..ff1b28092 100644
--- a/examples/advanced/payment-filters.ts
+++ b/examples/advanced/payment-filters.ts
@@ -61,7 +61,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run("echo Hello, Golem! 👋"))
diff --git a/examples/advanced/proposal-filter.ts b/examples/advanced/proposal-filter.ts
index 226ab980c..81e8b4743 100644
--- a/examples/advanced/proposal-filter.ts
+++ b/examples/advanced/proposal-filter.ts
@@ -35,7 +35,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run(`echo [provider:${exe.provider.name}] Hello, Golem! 👋`))
diff --git a/examples/advanced/proposal-predefined-filter.ts b/examples/advanced/proposal-predefined-filter.ts
index d3d6414fd..7b1d4da41 100644
--- a/examples/advanced/proposal-predefined-filter.ts
+++ b/examples/advanced/proposal-predefined-filter.ts
@@ -33,7 +33,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run(`echo [provider:${exe.provider.name}] Hello, Golem! 👋`))
diff --git a/examples/advanced/proposal-selector.ts b/examples/advanced/proposal-selector.ts
index 23e4878f1..87cbea351 100644
--- a/examples/advanced/proposal-selector.ts
+++ b/examples/advanced/proposal-selector.ts
@@ -41,7 +41,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run(`echo [provider:${exe.provider.name}] Hello, Golem! 👋`))
diff --git a/examples/advanced/reuse-allocation.ts b/examples/advanced/reuse-allocation.ts
index 97a463ff6..baa3710a3 100644
--- a/examples/advanced/reuse-allocation.ts
+++ b/examples/advanced/reuse-allocation.ts
@@ -52,8 +52,8 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
       },
     };
 
-    const rental1 = await glm.oneOf(firstOrder);
-    const rental2 = await glm.oneOf(secondOrder);
+    const rental1 = await glm.oneOf({ order: firstOrder });
+    const rental2 = await glm.oneOf({ order: secondOrder });
 
     await rental1
       .getExeUnit()
diff --git a/examples/advanced/setup-and-teardown.ts b/examples/advanced/setup-and-teardown.ts
new file mode 100644
index 000000000..7f969ca37
--- /dev/null
+++ b/examples/advanced/setup-and-teardown.ts
@@ -0,0 +1,101 @@
+/**
+ * This advanced example shows how to use the setup and teardown lifecycle functions
+ * to avoid doing the same work multiple times when running multiple tasks on the same provider.
+ */
+import { MarketOrderSpec, GolemNetwork, LifecycleFunction } from "@golem-sdk/golem-js";
+import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
+
+const order: MarketOrderSpec = {
+  demand: {
+    workload: {
+      imageTag: "golem/examples-openssl:latest",
+    },
+  },
+  market: {
+    rentHours: 0.5,
+    pricing: {
+      model: "linear",
+      maxStartPrice: 0.5,
+      maxCpuPerHourPrice: 1.0,
+      maxEnvPerHourPrice: 0.5,
+    },
+  },
+};
+
+/**
+ * Let's decrypt these messages in parallel on multiple providers.
+ * We know that the messages were encrypted using the aes-256-cbc algorithm
+ * with 5000000 iterations and the password "golemnetwork".
+ */
+const secretMessages = `
+U2FsdGVkX18S4g4iyUzjfqIwP/cGppD86mrVQ0kYerfSe3OnGORuU4nYLG6WXy5KG6vLVLq1N/jnyrwkT8yEBA==
+U2FsdGVkX1+jEgVgmS+xu37tT5OHieX8cioZHPyjUTh+YodWf0In3DaqtFcEfw2cLHIBd94s4nEmONHCs9x4Rg==
+U2FsdGVkX1+JU+fBsnKEGZHGoQpEY/DqlnbCQVg+KgLtkFbtjuHpQbMjnb7iBuj4o4yIYU00jM67+gqn89hrNA==
+U2FsdGVkX1897oplQ7utV9zpx/86GABjUP29Xr/GsahKQ9eRv9GgnzW9BCqHKiFjiB2q2F6gCJINspbuiFY+Fg==
+U2FsdGVkX183p8EUPOZj/QZFQSeIeYNSSfHcRrBF0NXSJ4RfibvT5HtJJ/5I9fVpc1XpbLwDsCW2yFdQKSzbXA==
+U2FsdGVkX184PQiKxx8Sfvl+BOy9JYrBQqdMxWEDc3GBDkEb3qYCWL7FPxZpCEwoZ10MpvY1EKb4lMMxWth6bw==
+U2FsdGVkX1/ujngC/IwK8UAvj41t/FbSHVFiiXI7+KeHoKW3HKcwZYb0E+nncpPC6ZT0DgWLzvDaUyBqOS+tkA==
+U2FsdGVkX19GNHf4ORUAy2PC3MMnvjx7aZSRNSqkW20fZ03Dc2OnZEWBDPa1J4yx
+U2FsdGVkX18iL21PNCohSdFuIOufknLXmINnYf3q15Fl+1vFcRnmC8b9zcrob5Iz/9dNkvrgAeNFmAwWK0bwPw==
+U2FsdGVkX18jQbGQ7KTAaRask5efrXEWvvGhe4jQ0MT9mwwH4ULjvoWDm1mNlsjYtb1nRt0O6iBd4O9moHLbbg==
+`.trim();
+
+(async () => {
+  const glm = new GolemNetwork({
+    logger: pinoPrettyLogger({
+      // for this example we disable info logs to better show the output
+      level: "warn",
+    }),
+  });
+
+  try {
+    await glm.connect();
+
+    // I want to upload my encrypted messages to the provider before I start working
+    const setup: LifecycleFunction = async (exe) =>
+      exe
+        .run(`echo "${secretMessages}" > /golem/work/encrypted-messages.txt`)
+        .then(() => console.log("Uploaded the encrypted messages to the provider %s", exe.provider.name));
+
+    // I want to remove the encrypted messages from the provider after I finish working
+    const teardown: LifecycleFunction = async (exe) =>
+      exe
+        .run("rm /golem/work/encrypted-messages.txt")
+        .then(() => console.log("Removed the encrypted messages from the provider %s", exe.provider.name));
+
+    const pool = await glm.manyOf({
+      concurrency: { max: 3 }, // I want to decrypt in parallel on a maximum of 3 machines simultaneously
+      order,
+      setup,
+      teardown,
+    });
+
+    // map each message to a decryption task
+    const decryptionTasks = new Array(10).fill(null).map((_, i) =>
+      pool.withRental(async (rental) => {
+        const exe = await rental.getExeUnit();
+        const result = await exe.run(
+          `sed '${i + 1}!d' /golem/work/encrypted-messages.txt | \
+              openssl \
+                enc -aes-256-cbc -d -a \
+                -pass pass:golemnetwork \
+                -iter 5000000`,
+        );
+        console.log("Finished decrypting message #%s on the provider %s", i + 1, exe.provider.name);
+        return String(result.stdout).trim();
+      }),
+    );
+    const decryptedMessages = await Promise.all(decryptionTasks);
+    await pool.drainAndClear();
+
+    console.log("Decrypted messages:");
+    for (const message of decryptedMessages) {
+      // display the decrypted messages in light-blue color
+      console.log("\x1b[36m%s\x1b[0m", message);
+    }
+  } catch (err) {
+    console.error("Failed to run the example", err);
+  } finally {
+    await glm.disconnect();
+  }
+})().catch(console.error);
diff --git a/examples/advanced/step-by-step.ts b/examples/advanced/step-by-step.ts
index c45d6ff16..b0d8c4066 100644
--- a/examples/advanced/step-by-step.ts
+++ b/examples/advanced/step-by-step.ts
@@ -136,11 +136,11 @@ import { filter, map, switchMap, take } from "rxjs";
     // Start the computation
     // First lets start the activity - this will deploy our image on the provider's machine
     const activity = await glm.activity.createActivity(agreement);
-    // Then let's create a WorkContext, which is a set of utilities to interact with the
+    // Then let's create a ExeUnit, which is a set of utilities to interact with the
     // providers machine, like running commands, uploading files, etc.
-    const ctx = await glm.activity.createWorkContext(activity);
+    const exe = await glm.activity.createExeUnit(activity);
     // Now we can run a simple command on the provider's machine
-    const result = await ctx.run("echo Hello, Golem 👋!");
+    const result = await exe.run("echo Hello, Golem 👋!");
     console.log("Result of the command ran on the provider's machine:", result.stdout);
 
     // We're done, let's clean up
diff --git a/examples/basic/events.ts b/examples/basic/events.ts
index 3a6291d09..ed150692c 100644
--- a/examples/basic/events.ts
+++ b/examples/basic/events.ts
@@ -36,16 +36,18 @@ import { pinoPrettyLogger } from "@golem-sdk/pino-logger";
     });
 
     const rental = await glm.oneOf({
-      demand: {
-        workload: { imageTag: "golem/alpine:latest" },
-      },
-      market: {
-        rentHours: 0.5,
-        pricing: {
-          model: "linear",
-          maxStartPrice: 0.5,
-          maxCpuPerHourPrice: 1.0,
-          maxEnvPerHourPrice: 0.5,
+      order: {
+        demand: {
+          workload: { imageTag: "golem/alpine:latest" },
+        },
+        market: {
+          rentHours: 0.5,
+          pricing: {
+            model: "linear",
+            maxStartPrice: 0.5,
+            maxCpuPerHourPrice: 1.0,
+            maxEnvPerHourPrice: 0.5,
+          },
         },
       },
     });
diff --git a/examples/basic/one-of.ts b/examples/basic/one-of.ts
index c22007c08..214145c3b 100644
--- a/examples/basic/one-of.ts
+++ b/examples/basic/one-of.ts
@@ -25,7 +25,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     await rental
       .getExeUnit()
       .then((exe) => exe.run("echo Hello, Golem! 👋"))
diff --git a/examples/basic/run-and-stream.ts b/examples/basic/run-and-stream.ts
index efcb19408..a426b34ed 100644
--- a/examples/basic/run-and-stream.ts
+++ b/examples/basic/run-and-stream.ts
@@ -30,7 +30,7 @@ const order: MarketOrderSpec = {
 
   try {
     await glm.connect();
-    const rental = await glm.oneOf(order);
+    const rental = await glm.oneOf({ order });
     const exe = await rental.getExeUnit();
 
     const remoteProcess = await exe.runAndStream(
diff --git a/examples/docs-examples/quickstarts/retrievable-task/task.mjs b/examples/docs-examples/quickstarts/retrievable-task/task.mjs
index f11d0a5b0..b73dda544 100644
--- a/examples/docs-examples/quickstarts/retrievable-task/task.mjs
+++ b/examples/docs-examples/quickstarts/retrievable-task/task.mjs
@@ -10,8 +10,8 @@ const job = golem.createJob({
     imageTag: "golem/alpine:latest",
   },
 });
-job.startWork(async (ctx) => {
-  const response = await ctx.run("echo 'Hello, Golem!'");
+job.startWork(async (exe) => {
+  const response = await exe.run("echo 'Hello, Golem!'");
   return response.stdout;
 });
 
diff --git a/examples/experimental/express/server.ts b/examples/experimental/express/server.ts
index b68c83374..2a970081a 100644
--- a/examples/experimental/express/server.ts
+++ b/examples/experimental/express/server.ts
@@ -53,9 +53,9 @@ app.post("/tts", async (req, res) => {
     console.log("Job succeeded", job.results);
   });
 
-  job.startWork(async (ctx) => {
+  job.startWork(async (exe) => {
     const fileName = `${Math.random().toString(36).slice(2)}.wav`;
-    await ctx
+    await exe
       .beginBatch()
       .run(`espeak "${req.body}" -w /golem/output/output.wav`)
       .downloadFile("/golem/output/output.wav", `public/${fileName}`)
diff --git a/examples/experimental/job/cancel.ts b/examples/experimental/job/cancel.ts
index e09740ae3..422caf4ba 100644
--- a/examples/experimental/job/cancel.ts
+++ b/examples/experimental/job/cancel.ts
@@ -41,8 +41,8 @@ async function main() {
     console.log("Job ended event emitted");
   });
 
-  job.startWork(async (ctx) => {
-    return String((await ctx.run("echo -n 'Hello Golem!'")).stdout);
+  job.startWork(async (exe) => {
+    return String((await exe.run("echo -n 'Hello Golem!'")).stdout);
   });
 
   console.log("Canceling job...");
diff --git a/examples/experimental/job/getJobById.ts b/examples/experimental/job/getJobById.ts
index 01bf0c405..7276a2984 100644
--- a/examples/experimental/job/getJobById.ts
+++ b/examples/experimental/job/getJobById.ts
@@ -37,8 +37,8 @@ function startJob() {
     console.log("Job ended event emitted");
   });
 
-  job.startWork(async (ctx) => {
-    return String((await ctx.run("echo -n 'Hello Golem!'")).stdout);
+  job.startWork(async (exe) => {
+    return String((await exe.run("echo -n 'Hello Golem!'")).stdout);
   });
   return job.id;
 }
diff --git a/examples/experimental/job/waitForResults.ts b/examples/experimental/job/waitForResults.ts
index 4d6fcbdbd..d71bdf73b 100644
--- a/examples/experimental/job/waitForResults.ts
+++ b/examples/experimental/job/waitForResults.ts
@@ -40,8 +40,8 @@ async function main() {
     console.log("Job ended event emitted");
   });
 
-  job.startWork(async (ctx) => {
-    return String((await ctx.run("echo -n 'Hello Golem!'")).stdout);
+  job.startWork(async (exe) => {
+    return String((await exe.run("echo -n 'Hello Golem!'")).stdout);
   });
 
   const result = await job.waitForResult();
diff --git a/examples/package.json b/examples/package.json
index 9325d59a2..637c817df 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -16,6 +16,7 @@
     "advanced-payment-filters": "tsx advanced/payment-filters.ts",
     "advanced-proposal-filters": "tsx advanced/proposal-filter.ts",
     "advanced-proposal-predefined-filter": "tsx advanced/proposal-predefined-filter.ts",
+    "advanced-setup-and-teardown": "tsx advanced/setup-and-teardown.ts",
     "local-image": "tsx advanced/local-image/serveLocalGvmi.ts",
     "deployment": "tsx experimental/deployment/new-api.ts",
     "market-scan": "tsx market/scan.ts",
diff --git a/examples/web/hello.html b/examples/web/hello.html
index cb083025c..c68002505 100644
--- a/examples/web/hello.html
+++ b/examples/web/hello.html
@@ -114,7 +114,7 @@ <h3>Results</h3>
           appendResults("Establishing a connection to the Golem Network");
           await glm.connect();
           appendResults("Request for renting a provider machine");
-          const rental = await glm.oneOf(order);
+          const rental = await glm.oneOf({ order });
           await rental
             .getExeUnit()
             .then(async (exe) =>
diff --git a/package.json b/package.json
index c8e70de7a..86c56a7ce 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "docs": "typedoc src/ --plugin typedoc-plugin-merge-modules --plugin typedoc-theme-hierarchy",
     "docs:md": "typedoc src/ --plugin typedoc-plugin-markdown --plugin .docs/typedoc-frontmatter-theme.cjs --hideBreadcrumbs true && node .docs/summary-generator.cjs",
     "test": "npm run test:unit && npm run test:e2e",
-    "test:unit": "jest --config tests/unit/jest.config.json",
+    "test:unit": "jest --config tests/jest.config.json",
     "test:e2e": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --config tests/e2e/jest.config.json tests/e2e/**.spec.ts --runInBand --forceExit",
     "test:cypress": "cypress run",
     "test:examples": "tsx tests/examples/examples.test.ts",
diff --git a/src/activity/activity.module.ts b/src/activity/activity.module.ts
index be982e272..6aa3664fa 100644
--- a/src/activity/activity.module.ts
+++ b/src/activity/activity.module.ts
@@ -3,7 +3,7 @@ import { Agreement } from "../market/agreement";
 import { Activity, IActivityApi, ActivityEvents, Result } from "./index";
 import { defaultLogger } from "../shared/utils";
 import { GolemServices } from "../golem-network/golem-network";
-import { WorkContext, WorkOptions } from "./work";
+import { ExeUnit, ExeUnitOptions } from "./exe-unit";
 import { ExeScriptExecutor, ExeScriptRequest, ExecutionOptions } from "./exe-script-executor";
 import { Observable, catchError, tap } from "rxjs";
 import { StreamingBatchEvent } from "./results";
@@ -38,11 +38,11 @@ export interface ActivityModule {
   findActivityById(activityId: string): Promise<Activity>;
 
   /**
-   * Create a work context "within" the activity so that you can perform commands on the rented resources
+   * Create a exe-unit "within" the activity so that you can perform commands on the rented resources
    *
-   * @return An WorkContext that's fully commissioned and the user can execute their commands
+   * @return An ExeUnit that's fully commissioned and the user can execute their commands
    */
-  createWorkContext(activity: Activity, options?: WorkOptions): Promise<WorkContext>;
+  createExeUnit(activity: Activity, options?: ExeUnitOptions): Promise<ExeUnit>;
 
   /**
    * Factory method for creating a script executor for the activity
@@ -274,30 +274,30 @@ export class ActivityModuleImpl implements ActivityModule {
     return await this.activityApi.getActivity(activityId);
   }
 
-  async createWorkContext(activity: Activity, options?: WorkOptions): Promise<WorkContext> {
-    this.logger.info("Creating work context for activity", { activityId: activity.id });
-    const ctx = new WorkContext(activity, this, {
+  async createExeUnit(activity: Activity, options?: ExeUnitOptions): Promise<ExeUnit> {
+    this.logger.info("Creating exe-unit for activity", { activityId: activity.id });
+    const exe = new ExeUnit(activity, this, {
       yagnaOptions: this.services.yagna.yagnaOptions,
-      logger: this.logger.child("work-context"),
+      logger: this.logger.child("exe-unit"),
       ...options,
     });
 
     this.logger.debug("Initializing the exe-unit for activity", { activityId: activity.id });
     try {
-      await ctx.before();
+      await exe.setup();
       this.events.emit(
-        "workContextInitialized",
+        "exeUnitInitialized",
         await this.refreshActivity(activity).catch(() => {
           this.logger.warn("Failed to refresh activity after work context initialization", { activityId: activity.id });
           return activity;
         }),
       );
-      return ctx;
+      return exe;
     } catch (error) {
       this.events.emit(
-        "errorInitializingWorkContext",
+        "errorInitializingExeUnit",
         await this.refreshActivity(activity).catch(() => {
-          this.logger.warn("Failed to refresh activity after work context initialization error", {
+          this.logger.warn("Failed to refresh activity after exe-unit initialization error", {
             activityId: activity.id,
           });
           return activity;
diff --git a/tests/unit/activity.test.ts b/src/activity/activity.test.ts
similarity index 91%
rename from tests/unit/activity.test.ts
rename to src/activity/activity.test.ts
index b5865091b..a767d1687 100644
--- a/tests/unit/activity.test.ts
+++ b/src/activity/activity.test.ts
@@ -1,4 +1,4 @@
-import { Activity, ActivityStateEnum, Agreement } from "../../src";
+import { Activity, ActivityStateEnum, Agreement } from "../index";
 import { instance, mock } from "@johanblumenberg/ts-mockito";
 
 const mockAgreement = mock(Agreement);
diff --git a/src/activity/api.ts b/src/activity/api.ts
index 904cbc214..4c832d5dc 100644
--- a/src/activity/api.ts
+++ b/src/activity/api.ts
@@ -11,8 +11,8 @@ export type ActivityEvents = {
   activityDestroyed: (activity: Activity) => void;
   errorDestroyingActivity: (activity: Activity, error: Error) => void;
 
-  workContextInitialized: (activity: Activity) => void;
-  errorInitializingWorkContext: (activity: Activity, error: Error) => void;
+  exeUnitInitialized: (activity: Activity) => void;
+  errorInitializingExeUnit: (activity: Activity, error: Error) => void;
 
   activityStateChanged: (activity: Activity, previousState: ActivityStateEnum) => void;
   errorRefreshingActivity: (activity: Activity, error: Error) => void;
diff --git a/src/activity/exe-script-executor.test.ts b/src/activity/exe-script-executor.test.ts
index 7f7d19f2a..be3663820 100644
--- a/src/activity/exe-script-executor.test.ts
+++ b/src/activity/exe-script-executor.test.ts
@@ -1,8 +1,8 @@
 import { Activity } from "./activity";
 import { _, anything, imock, instance, mock, reset, verify, when } from "@johanblumenberg/ts-mockito";
 import { Capture, Deploy, DownloadFile, Run, Script, Start, Terminate, UploadFile } from "./script";
-import { buildExeScriptSuccessResult } from "../../tests/unit/helpers";
-import { GolemWorkError, WorkErrorCode } from "./work";
+import { buildExeScriptSuccessResult } from "../../tests/utils/helpers";
+import { GolemWorkError, WorkErrorCode } from "./exe-unit";
 import { Logger, sleep } from "../shared/utils";
 import { GolemAbortError, GolemError } from "../shared/error/golem-error";
 import { ExeScriptExecutor } from "./exe-script-executor";
diff --git a/src/activity/exe-script-executor.ts b/src/activity/exe-script-executor.ts
index b8c00bc10..c3f037a46 100644
--- a/src/activity/exe-script-executor.ts
+++ b/src/activity/exe-script-executor.ts
@@ -1,7 +1,7 @@
 import { createAbortSignalFromTimeout, Logger } from "../shared/utils";
 import { ExecutionConfig } from "./config";
 import { Readable } from "stream";
-import { GolemWorkError, WorkErrorCode } from "./work";
+import { GolemWorkError, WorkErrorCode } from "./exe-unit";
 import { withTimeout } from "../shared/utils/timeout";
 import { GolemAbortError } from "../shared/error/golem-error";
 import retry from "async-retry";
@@ -114,10 +114,7 @@ export class ExeScriptExecutor {
       objectMode: true,
       async read() {
         const abortError = new GolemAbortError("Execution of script has been aborted", abortSignal.reason);
-        abortSignal.addEventListener("abort", () => {
-          logger.warn(abortError.message, { activityId: activity.id, batchId, reason: abortSignal.reason });
-          this.destroy(abortError);
-        });
+        abortSignal.addEventListener("abort", () => this.destroy(abortError));
         while (!isBatchFinished && !abortSignal.aborted) {
           logger.debug("Polling for batch script execution result");
 
@@ -163,6 +160,7 @@ export class ExeScriptExecutor {
             }
           } catch (error) {
             if (abortSignal.aborted) {
+              logger.warn(abortError.message, { activityId: activity.id, batchId, reason: abortSignal.reason });
               return this.destroy(abortError);
             }
             logger.error(`Processing script execution results failed`, error);
@@ -207,10 +205,7 @@ export class ExeScriptExecutor {
       objectMode: true,
       async read() {
         const abortError = new GolemAbortError("Execution of script has been aborted", abortSignal.reason);
-        abortSignal.addEventListener("abort", () => {
-          logger.warn(abortError.message, { activityId: activity.id, batchId, reason: abortSignal.reason });
-          this.destroy(abortError);
-        });
+        abortSignal.addEventListener("abort", () => this.destroy(abortError));
         while (!isBatchFinished && !abortSignal.aborted) {
           let error: Error | undefined;
 
@@ -240,8 +235,8 @@ export class ExeScriptExecutor {
           await sleep(500, true);
         }
         if (abortSignal.aborted) {
-          this.destroy(abortError);
-          return;
+          logger.warn(abortError.message, { activityId: activity.id, batchId, reason: abortSignal.reason });
+          return this.destroy(abortError);
         } else {
           this.push(null);
         }
diff --git a/src/activity/work/batch.spec.ts b/src/activity/exe-unit/batch.spec.ts
similarity index 99%
rename from src/activity/work/batch.spec.ts
rename to src/activity/exe-unit/batch.spec.ts
index ba9a72f59..cb70af1fa 100644
--- a/src/activity/work/batch.spec.ts
+++ b/src/activity/exe-unit/batch.spec.ts
@@ -9,7 +9,7 @@ import {
   buildExeScriptSuccessResult,
   buildExeScriptErrorResult,
   buildExecutorResults,
-} from "../../../tests/unit/helpers";
+} from "../../../tests/utils/helpers";
 import { Agreement } from "../../market/agreement";
 
 import { ExeScriptExecutor } from "../exe-script-executor";
diff --git a/src/activity/work/batch.ts b/src/activity/exe-unit/batch.ts
similarity index 100%
rename from src/activity/work/batch.ts
rename to src/activity/exe-unit/batch.ts
diff --git a/src/activity/work/error.ts b/src/activity/exe-unit/error.ts
similarity index 100%
rename from src/activity/work/error.ts
rename to src/activity/exe-unit/error.ts
diff --git a/tests/unit/work.test.ts b/src/activity/exe-unit/exe-unit.test.ts
similarity index 73%
rename from tests/unit/work.test.ts
rename to src/activity/exe-unit/exe-unit.test.ts
index c0d049b6b..5ea3b11de 100644
--- a/tests/unit/work.test.ts
+++ b/src/activity/exe-unit/exe-unit.test.ts
@@ -8,16 +8,20 @@ import {
   IActivityApi,
   NetworkNode,
   StorageProvider,
-  WorkContext,
+  ExeUnit,
   WorkErrorCode,
   YagnaExeScriptObserver,
-} from "../../src";
+} from "../../index";
 import { _, anyOfClass, anything, imock, instance, mock, reset, verify, when } from "@johanblumenberg/ts-mockito";
-import { buildExecutorResults, buildExeScriptErrorResult, buildExeScriptSuccessResult } from "./helpers";
-import { StorageProviderDataCallback } from "../../src/shared/storage/provider";
+import {
+  buildExecutorResults,
+  buildExeScriptErrorResult,
+  buildExeScriptSuccessResult,
+} from "../../../tests/utils/helpers";
+import { StorageProviderDataCallback } from "../../shared/storage/provider";
 import { ActivityApi } from "ya-ts-client";
-import { ExeScriptExecutor } from "../../src/activity/exe-script-executor";
-import { INetworkApi } from "../../src/network/api";
+import { ExeScriptExecutor } from "../exe-script-executor";
+import { INetworkApi } from "../../network/api";
 
 const mockActivityApi = imock<IActivityApi>();
 const mockNetworkApi = imock<INetworkApi>();
@@ -29,7 +33,7 @@ const mockStorageProvider = imock<StorageProvider>();
 const mockAgreement = mock(Agreement);
 const mockActivityModule = imock<ActivityModule>();
 
-describe("Work Context", () => {
+describe("ExeUnit", () => {
   beforeEach(() => {
     // Make mocks ready to re-use
     reset(mockActivityApi);
@@ -66,10 +70,10 @@ describe("Work Context", () => {
         ]),
       );
 
-      const worker = async (ctx: WorkContext) => ctx.run("some_shell_command");
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
-      await ctx.before();
-      const results = await worker(ctx);
+      const worker = async (exe: ExeUnit) => exe.run("some_shell_command");
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
+      await exe.setup();
+      const results = await worker(exe);
       expect(results?.stdout).toEqual("test_result");
     });
 
@@ -86,17 +90,17 @@ describe("Work Context", () => {
         ]),
       );
 
-      const worker = async (ctx: WorkContext) => ctx.run("/bin/ls", ["-R"]);
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
-      await ctx.before();
-      const results = await worker(ctx);
+      const worker = async (exe: ExeUnit) => exe.run("/bin/ls", ["-R"]);
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
+      await exe.setup();
+      const results = await worker(exe);
 
       expect(results?.stdout).toEqual("test_result_from_ls");
     });
 
     describe("upload commands", () => {
       it("should execute upload file command", async () => {
-        const worker = async (ctx: WorkContext) => ctx.uploadFile("./file.txt", "/golem/file.txt");
+        const worker = async (exe: ExeUnit) => exe.uploadFile("./file.txt", "/golem/file.txt");
 
         when(mockExecutor.execute(_, _, _, _)).thenResolve(
           buildExecutorResults([
@@ -110,17 +114,17 @@ describe("Work Context", () => {
           ]),
         );
 
-        const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+        const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
           storageProvider: instance(mockStorageProvider),
         });
-        await ctx.before();
-        const results = await worker(ctx);
+        await exe.setup();
+        const results = await worker(exe);
         expect(results?.stdout).toEqual("test_result");
         verify(mockStorageProvider.publishFile("./file.txt")).once();
       });
 
       it("should execute upload json command", async () => {
-        const worker = async (ctx: WorkContext) => ctx.uploadJson({ test: true }, "/golem/file.txt");
+        const worker = async (exe: ExeUnit) => exe.uploadJson({ test: true }, "/golem/file.txt");
 
         when(mockExecutor.execute(_, _, _, _)).thenResolve(
           buildExecutorResults([
@@ -134,11 +138,11 @@ describe("Work Context", () => {
           ]),
         );
 
-        const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+        const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
           storageProvider: instance(mockStorageProvider),
         });
-        await ctx.before();
-        const results = await worker(ctx);
+        await exe.setup();
+        const results = await worker(exe);
 
         expect(results?.stdout).toEqual("test_result");
         verify(mockStorageProvider.publishData(anyOfClass(Uint8Array))).once();
@@ -147,7 +151,7 @@ describe("Work Context", () => {
 
     describe("download commands", () => {
       it("should execute download file command", async () => {
-        const worker = async (ctx: WorkContext) => ctx.downloadFile("/golem/file.txt", "./file.txt");
+        const worker = async (exe: ExeUnit) => exe.downloadFile("/golem/file.txt", "./file.txt");
 
         when(mockExecutor.execute(_, _, _, _)).thenResolve(
           buildExecutorResults([
@@ -161,12 +165,12 @@ describe("Work Context", () => {
           ]),
         );
 
-        const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+        const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
           storageProvider: instance(mockStorageProvider),
         });
 
-        await ctx.before();
-        const results = await worker(ctx);
+        await exe.setup();
+        const results = await worker(exe);
 
         expect(results?.stdout).toEqual("test_result");
         verify(mockStorageProvider.receiveFile("./file.txt")).once();
@@ -194,10 +198,10 @@ describe("Work Context", () => {
           return "/golem/file.txt";
         });
 
-        const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+        const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
           storageProvider: instance(mockStorageProvider),
         });
-        const result = await ctx.downloadJson("/golem/file.txt");
+        const result = await exe.downloadJson("/golem/file.txt");
 
         expect(result.result).toEqual("Ok");
         expect(result.data).toEqual(json);
@@ -227,10 +231,10 @@ describe("Work Context", () => {
           return "/golem/file.txt";
         });
 
-        const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+        const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
           storageProvider: instance(mockStorageProvider),
         });
-        const result = await ctx.downloadData("/golem/file.txt");
+        const result = await exe.downloadData("/golem/file.txt");
 
         expect(result).toEqual(
           expect.objectContaining({
@@ -246,7 +250,7 @@ describe("Work Context", () => {
 
   describe("Exec and stream", () => {
     it("should execute runAndStream command", async () => {
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
       when(mockExecutor.execute(_, _, _, _)).thenResolve(
         buildExecutorResults([
           {
@@ -257,7 +261,7 @@ describe("Work Context", () => {
           },
         ]),
       );
-      const remote = await ctx.runAndStream("rm -rf foo/");
+      const remote = await exe.runAndStream("rm -rf foo/");
 
       const finalResult = await remote.waitForExit();
       expect(finalResult.result).toBe("Ok");
@@ -266,7 +270,7 @@ describe("Work Context", () => {
 
   describe("transfer()", () => {
     it("should execute transfer command", async () => {
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
 
       when(mockExecutor.execute(_, _, _, _)).thenResolve(
         buildExecutorResults([
@@ -281,15 +285,15 @@ describe("Work Context", () => {
         ]),
       );
 
-      const remote = await ctx.transfer("http://golem.network/test.txt", "/golem/work/test.txt");
+      const remote = await exe.transfer("http://golem.network/test.txt", "/golem/work/test.txt");
       expect(remote.result).toEqual("Ok");
     });
   });
 
   describe("Batch", () => {
     it("should execute batch as promise", async () => {
-      const worker = async (ctx: WorkContext) => {
-        return ctx
+      const worker = async (exe: ExeUnit) => {
+        return exe
           .beginBatch()
           .run("some_shell_command")
           .uploadFile("./file.txt", "/golem/file.txt")
@@ -297,7 +301,7 @@ describe("Work Context", () => {
           .downloadFile("/golem/file.txt", "./file.txt")
           .end();
       };
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
         storageProvider: instance(mockStorageProvider),
       });
       const expectedStdout = [
@@ -311,7 +315,7 @@ describe("Work Context", () => {
         buildExecutorResults(expectedStdout.map((e) => buildExeScriptSuccessResult(e.stdout))),
       );
 
-      const results = await worker(ctx);
+      const results = await worker(exe);
       expect(results?.map((r) => r.stdout)).toEqual(expectedStdout.map((s) => s.stdout));
 
       verify(mockStorageProvider.publishFile("./file.txt")).once();
@@ -320,8 +324,8 @@ describe("Work Context", () => {
     });
 
     it("should execute batch as stream", async () => {
-      const worker = async (ctx: WorkContext) => {
-        return ctx
+      const worker = async (exe: ExeUnit) => {
+        return exe
           .beginBatch()
           .run("some_shell_command")
           .uploadFile("./file.txt", "/golem/file.txt")
@@ -329,7 +333,7 @@ describe("Work Context", () => {
           .downloadFile("/golem/file.txt", "./file.txt")
           .endStream();
       };
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
         storageProvider: instance(mockStorageProvider),
       });
       const expectedStdout = [
@@ -343,7 +347,7 @@ describe("Work Context", () => {
         buildExecutorResults(expectedStdout.map((e) => buildExeScriptSuccessResult(e.stdout))),
       );
 
-      const results = await worker(ctx);
+      const results = await worker(exe);
       await new Promise((res, rej) => {
         results?.on("data", (result) => {
           try {
@@ -364,16 +368,16 @@ describe("Work Context", () => {
   describe("fetchState() helper function", () => {
     it("should return activity state", async () => {
       when(mockActivity.getState()).thenReturn(ActivityStateEnum.Deployed);
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
-      await expect(ctx["fetchState"]()).resolves.toEqual(ActivityStateEnum.Deployed);
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
+      await expect(exe["fetchState"]()).resolves.toEqual(ActivityStateEnum.Deployed);
     });
   });
 
   describe("getIp()", () => {
     it("should throw error if there is no network node", async () => {
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
 
-      expect(() => ctx.getIp()).toThrow(new Error("There is no network in this work context"));
+      expect(() => exe.getIp()).toThrow(new Error("There is no network in this exe-unit"));
     });
 
     it("should return ip address of provider vpn network node", async () => {
@@ -390,31 +394,31 @@ describe("Work Context", () => {
         }),
         "http://127.0.0.1:7465",
       );
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
         networkNode,
       });
 
-      expect(ctx.getIp()).toEqual("192.168.0.10");
+      expect(exe.getIp()).toEqual("192.168.0.10");
     });
   });
 
   describe("getWebsocketUri()", () => {
     it("should throw error if there is no network node", async () => {
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
 
-      expect(() => ctx.getWebsocketUri(80)).toThrow(new Error("There is no network in this work context"));
+      expect(() => exe.getWebsocketUri(80)).toThrow(new Error("There is no network in this exe-unit"));
     });
 
     it("should return websocket URI from the NetworkNode", async () => {
       const mockNode = mock(NetworkNode);
 
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
         networkNode: instance(mockNode),
       });
 
       when(mockNode.getWebsocketUri(20)).thenReturn("ws://localhost:20");
 
-      expect(ctx.getWebsocketUri(20)).toEqual("ws://localhost:20");
+      expect(exe.getWebsocketUri(20)).toEqual("ws://localhost:20");
     });
   });
 
@@ -435,11 +439,11 @@ describe("Work Context", () => {
         ]),
       );
 
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), {
         storageProvider: instance(mockStorageProvider),
       });
 
-      const result = await ctx.uploadData(new TextEncoder().encode(input), "/golem/file.txt");
+      const result = await exe.uploadData(new TextEncoder().encode(input), "/golem/file.txt");
 
       expect(result).toEqual(
         expect.objectContaining({
@@ -453,47 +457,37 @@ describe("Work Context", () => {
   });
 
   describe("setupActivity() - called as part of before()", () => {
-    it("should call all setup functions in the order they were registered", async () => {
-      const calls: string[] = [];
-      const activityReadySetupFunctions = [
-        async () => calls.push("1"),
-        async () => calls.push("2"),
-        async () => calls.push("3"),
-      ];
-
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule), {
-        activityReadySetupFunctions,
-      });
-
-      await ctx.before();
-
-      expect(calls).toEqual(["1", "2", "3"]);
+    it("should call setup function", async () => {
+      const setup = jest.fn();
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule), { setup });
+      await exe.setup();
+      expect(setup).toHaveBeenCalled();
     });
   });
 
   describe("Error handling", () => {
     it("should return a result with error in case the command to execute is invalid", async () => {
-      const worker = async (ctx: WorkContext) => ctx.beginBatch().run("invalid_shell_command").end();
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const worker = async (exe: ExeUnit) => exe.beginBatch().run("invalid_shell_command").end();
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
 
       when(mockExecutor.execute(_)).thenResolve(
         buildExecutorResults(undefined, [buildExeScriptErrorResult("error", "Some error occurred")]),
       );
-      const [result] = await worker(ctx);
+      const [result] = await worker(exe);
 
       expect(result.result).toEqual("Error");
       expect(result.message).toEqual("Some error occurred");
     });
 
     it("should catch error while executing batch as stream with invalid command", async () => {
-      const worker = async (ctx: WorkContext) => ctx.beginBatch().run("invalid_shell_command").endStream();
-      const ctx = new WorkContext(instance(mockActivity), instance(mockActivityModule));
+      const worker = async (exe: ExeUnit) => exe.beginBatch().run("invalid_shell_command").endStream();
+      const exe = new ExeUnit(instance(mockActivity), instance(mockActivityModule));
 
       when(mockExecutor.execute(_)).thenResolve(
         buildExecutorResults(undefined, [buildExeScriptErrorResult("error", "Some error occurred", "test_result")]),
       );
 
-      const results = await worker(ctx);
+      const results = await worker(exe);
 
       await new Promise((res) =>
         results.once("error", (error: GolemModuleError) => {
diff --git a/src/activity/work/work.ts b/src/activity/exe-unit/exe-unit.ts
similarity index 92%
rename from src/activity/work/work.ts
rename to src/activity/exe-unit/exe-unit.ts
index 7214f59de..c32b528f3 100644
--- a/src/activity/work/work.ts
+++ b/src/activity/exe-unit/exe-unit.ts
@@ -23,20 +23,23 @@ import { Agreement, ProviderInfo } from "../../market/agreement";
 import { TcpProxy } from "../../network/tcpProxy";
 import { ExecutionOptions, ExeScriptExecutor } from "../exe-script-executor";
 
-export type Worker<OutputType> = (ctx: WorkContext) => Promise<OutputType>;
+export type LifecycleFunction = (exe: ExeUnit) => Promise<void>;
 
 const DEFAULTS = {
   activityDeployingTimeout: 300_000,
 };
 
-export interface WorkOptions {
+export interface ExeUnitOptions {
   activityDeployingTimeout?: number;
   storageProvider?: StorageProvider;
   networkNode?: NetworkNode;
   logger?: Logger;
-  activityReadySetupFunctions?: Worker<unknown>[];
   yagnaOptions?: YagnaOptions;
-  execution?: ExecutionOptions;
+  /** this function is called as soon as the exe unit is ready */
+  setup?: LifecycleFunction;
+  /** this function is called before the exe unit is destroyed */
+  teardown?: LifecycleFunction;
+  executionOptions?: ExecutionOptions;
   signalOrTimeout?: number | AbortSignal;
 }
 
@@ -56,7 +59,7 @@ export interface ActivityDTO {
 /**
  * Groups most common operations that the requestors might need to implement their workflows
  */
-export class WorkContext {
+export class ExeUnit {
   private readonly activityDeployingTimeout: number;
 
   public readonly provider: ProviderInfo;
@@ -71,7 +74,7 @@ export class WorkContext {
   constructor(
     public readonly activity: Activity,
     public readonly activityModule: ActivityModule,
-    private options?: WorkOptions,
+    private options?: ExeUnitOptions,
   ) {
     this.activityDeployingTimeout = options?.activityDeployingTimeout || DEFAULTS.activityDeployingTimeout;
 
@@ -82,7 +85,7 @@ export class WorkContext {
     this.networkNode = options?.networkNode;
     this.abortSignal = createAbortSignalFromTimeout(options?.signalOrTimeout);
     this.executor = this.activityModule.createScriptExecutor(this.activity, {
-      ...this.options?.execution,
+      ...this.options?.executionOptions,
       signalOrTimeout: this.abortSignal,
     });
   }
@@ -106,7 +109,12 @@ export class WorkContext {
       });
   }
 
-  async before(): Promise<Result[] | void> {
+  /**
+   * This function initializes the exe unit by deploying the image to the remote machine
+   * and preparing and running the environment.
+   * This process also includes running setup function if the user has defined it
+   */
+  async setup(): Promise<Result[] | void> {
     try {
       let state = await this.fetchState();
       if (state === ActivityStateEnum.Ready) {
@@ -144,6 +152,16 @@ export class WorkContext {
     }
   }
 
+  /**
+   * This function starts the teardown function if the user has defined it.
+   * It is run before the machine is destroyed.
+   */
+  async teardown(): Promise<void> {
+    if (this.options?.teardown) {
+      await this.options.teardown(this);
+    }
+  }
+
   private async deployActivity() {
     const result = await this.executor
       .execute(
@@ -202,11 +220,8 @@ export class WorkContext {
   }
 
   private async setupActivity() {
-    if (!this.options?.activityReadySetupFunctions) {
-      return;
-    }
-    for (const setupFunction of this.options.activityReadySetupFunctions) {
-      await setupFunction(this);
+    if (this.options?.setup) {
+      await this.options.setup(this);
     }
   }
 
@@ -357,7 +372,7 @@ export class WorkContext {
   getWebsocketUri(port: number): string {
     if (!this.networkNode)
       throw new GolemWorkError(
-        "There is no network in this work context",
+        "There is no network in this exe-unit",
         WorkErrorCode.NetworkSetupMissing,
         this.activity.agreement,
         this.activity,
@@ -370,7 +385,7 @@ export class WorkContext {
   getIp(): string {
     if (!this.networkNode)
       throw new GolemWorkError(
-        "There is no network in this work context",
+        "There is no network in this exe-unit",
         WorkErrorCode.NetworkSetupMissing,
         this.activity.agreement,
         this.activity,
diff --git a/src/activity/work/index.ts b/src/activity/exe-unit/index.ts
similarity index 65%
rename from src/activity/work/index.ts
rename to src/activity/exe-unit/index.ts
index 17d409ee1..41162c872 100644
--- a/src/activity/work/index.ts
+++ b/src/activity/exe-unit/index.ts
@@ -1,4 +1,4 @@
-export { WorkContext, Worker, WorkOptions } from "./work";
+export { ExeUnit, LifecycleFunction, ExeUnitOptions } from "./exe-unit";
 export { Batch } from "./batch";
 export { GolemWorkError, WorkErrorCode } from "./error";
 export { TcpProxy } from "../../network/tcpProxy";
diff --git a/src/activity/work/process.spec.ts b/src/activity/exe-unit/process.spec.ts
similarity index 98%
rename from src/activity/work/process.spec.ts
rename to src/activity/exe-unit/process.spec.ts
index 660f7368d..73b745d8f 100644
--- a/src/activity/work/process.spec.ts
+++ b/src/activity/exe-unit/process.spec.ts
@@ -7,7 +7,7 @@ import {
   buildExecutorResults,
   buildExeScriptErrorResult,
   buildExeScriptSuccessResult,
-} from "../../../tests/unit/helpers";
+} from "../../../tests/utils/helpers";
 
 const mockYagna = mock(YagnaApi);
 const mockAgreement = mock(Agreement);
diff --git a/src/activity/work/process.ts b/src/activity/exe-unit/process.ts
similarity index 98%
rename from src/activity/work/process.ts
rename to src/activity/exe-unit/process.ts
index 7f9577eae..4fa7b50a4 100644
--- a/src/activity/work/process.ts
+++ b/src/activity/exe-unit/process.ts
@@ -9,7 +9,7 @@ const DEFAULTS = {
 };
 
 /**
- * RemoteProcess class representing the process spawned on the provider by {@link activity/work/work.WorkContext.runAndStream}
+ * RemoteProcess class representing the process spawned on the provider by {@link activity/exe-unit/exeunit.ExeUnit.runAndStream}
  */
 export class RemoteProcess {
   /**
diff --git a/src/activity/index.ts b/src/activity/index.ts
index 06fb85957..3965651e5 100644
--- a/src/activity/index.ts
+++ b/src/activity/index.ts
@@ -2,5 +2,5 @@ export { Activity, ActivityStateEnum } from "./activity";
 export { Result } from "./results";
 export { ExecutionConfig } from "./config";
 export * from "./activity.module";
-export * from "./work";
+export * from "./exe-unit";
 export * from "./api";
diff --git a/src/experimental/job/job.test.ts b/src/experimental/job/job.test.ts
index 5df379040..49f2ccb67 100644
--- a/src/experimental/job/job.test.ts
+++ b/src/experimental/job/job.test.ts
@@ -1,5 +1,5 @@
 import { Job } from "./job";
-import { WorkContext } from "../../activity/work";
+import { ExeUnit } from "../../activity/exe-unit";
 import { anything, imock, instance, mock, reset, verify, when } from "@johanblumenberg/ts-mockito";
 import { Logger } from "../../shared/utils";
 import { GolemNetwork } from "../../golem-network";
@@ -7,17 +7,17 @@ import { ResourceRental } from "../../resource-rental";
 
 const mockGlm = mock(GolemNetwork);
 const mockRental = mock(ResourceRental);
-const mockWorkContext = mock(WorkContext);
+const mockExeUnit = mock(ExeUnit);
 describe("Job", () => {
   beforeEach(() => {
     reset(mockGlm);
     reset(mockRental);
-    reset(mockWorkContext);
+    reset(mockExeUnit);
   });
 
   describe("cancel()", () => {
     it("stops the activity and releases the agreement when canceled", async () => {
-      when(mockRental.getExeUnit()).thenResolve(instance(mockWorkContext));
+      when(mockRental.getExeUnit()).thenResolve(instance(mockExeUnit));
       when(mockGlm.oneOf(anything())).thenResolve(instance(mockRental));
       const job = new Job(
         "test_id",
diff --git a/src/experimental/job/job.ts b/src/experimental/job/job.ts
index 3285654a2..da208eef5 100644
--- a/src/experimental/job/job.ts
+++ b/src/experimental/job/job.ts
@@ -1,4 +1,4 @@
-import { Worker, WorkOptions } from "../../activity/work";
+import { ExeUnitOptions, ExeUnit } from "../../activity/exe-unit";
 import { NetworkOptions } from "../../network";
 import { PaymentModuleOptions } from "../../payment";
 import { EventEmitter } from "eventemitter3";
@@ -20,9 +20,11 @@ export type RunJobOptions = {
   payment?: PaymentModuleOptions;
   network?: NetworkOptions;
   workload?: WorkloadDemandDirectorConfigOptions;
-  work?: WorkOptions;
+  work?: ExeUnitOptions;
 };
 
+export type WorkFunction<OutputType> = (exe: ExeUnit) => Promise<OutputType>;
+
 export interface JobEventsDict {
   /**
    * Emitted immediately after the job is created and initialization begins.
@@ -93,7 +95,7 @@ export class Job<Output = unknown> {
    *
    * @param workOnGolem - Your worker function that will be run on the Golem Network.
    */
-  startWork(workOnGolem: Worker<Output>) {
+  startWork(workOnGolem: WorkFunction<Output>) {
     this.logger.debug("Staring work in a Job");
     if (this.isRunning()) {
       throw new GolemUserError(`Job ${this.id} is already running`);
@@ -106,7 +108,7 @@ export class Job<Output = unknown> {
     this.abortController = new AbortController();
 
     this.runWork({
-      worker: workOnGolem,
+      workOnGolem,
       signal: this.abortController.signal,
     })
       .then((results) => {
@@ -126,15 +128,15 @@ export class Job<Output = unknown> {
       });
   }
 
-  private async runWork({ worker, signal }: { worker: Worker<Output>; signal: AbortSignal }) {
+  private async runWork({ workOnGolem, signal }: { workOnGolem: WorkFunction<Output>; signal: AbortSignal }) {
     if (signal.aborted) {
       this.events.emit("canceled");
       throw new GolemAbortError("Canceled");
     }
 
-    const rental = await this.glm.oneOf(this.order);
+    const rental = await this.glm.oneOf({ order: this.order });
 
-    const workContext = await rental.getExeUnit();
+    const exeUnit = await rental.getExeUnit();
     this.events.emit("started");
 
     const onAbort = async () => {
@@ -149,7 +151,7 @@ export class Job<Output = unknown> {
 
     signal.addEventListener("abort", onAbort, { once: true });
 
-    return worker(workContext);
+    return workOnGolem(exeUnit);
   }
 
   /**
diff --git a/src/golem-network/golem-network.test.ts b/src/golem-network/golem-network.test.ts
index d02283f5b..87df4e021 100644
--- a/src/golem-network/golem-network.test.ts
+++ b/src/golem-network/golem-network.test.ts
@@ -87,7 +87,7 @@ describe("Golem Network", () => {
       const glm = getGolemNetwork();
       await glm.connect();
 
-      const rental = await glm.oneOf(order);
+      const rental = await glm.oneOf({ order });
 
       expect(rental).toBe(mockResourceRentalInstance);
 
@@ -111,9 +111,11 @@ describe("Golem Network", () => {
       await glm.connect();
 
       const rental = await glm.oneOf({
-        ...order,
-        payment: {
-          allocation,
+        order: {
+          ...order,
+          payment: {
+            allocation,
+          },
         },
       });
 
diff --git a/src/golem-network/golem-network.ts b/src/golem-network/golem-network.ts
index 7845a9c97..317d5a45d 100644
--- a/src/golem-network/golem-network.ts
+++ b/src/golem-network/golem-network.ts
@@ -9,7 +9,7 @@ import {
   OfferProposal,
 } from "../market";
 import { Allocation, IPaymentApi, PaymentModule, PaymentModuleImpl, PaymentModuleOptions } from "../payment";
-import { ActivityModule, ActivityModuleImpl, IActivityApi, IFileServer } from "../activity";
+import { ActivityModule, ActivityModuleImpl, ExeUnitOptions, IActivityApi, IFileServer } from "../activity";
 import { INetworkApi, Network, NetworkModule, NetworkModuleImpl, NetworkOptions } from "../network";
 import { EventEmitter } from "eventemitter3";
 import {
@@ -141,9 +141,18 @@ export interface GolemNetworkEvents {
   disconnected: () => void;
 }
 
+export interface OneOfOptions {
+  order: MarketOrderSpec;
+  signalOrTimeout?: number | AbortSignal;
+  setup?: ExeUnitOptions["setup"];
+  teardown?: ExeUnitOptions["teardown"];
+}
+
 export interface ManyOfOptions {
-  concurrency: Concurrency;
   order: MarketOrderSpec;
+  concurrency: Concurrency;
+  setup?: ExeUnitOptions["setup"];
+  teardown?: ExeUnitOptions["teardown"];
 }
 
 /**
@@ -357,10 +366,13 @@ export class GolemNetwork {
    * await rental.stopAndFinalize();
    * ```
    *
-   * @param order
-   * @param signalOrTimeout - the timeout in milliseconds or an AbortSignal that will be used to cancel the lease request
+   * @param {Object} options
+   * @param options.order - represents the order specifications which will result in access to ResourceRental.
+   * @param options.signalOrTimeout - timeout in milliseconds or an AbortSignal that will be used to cancel the rental request
+   * @param options.setup - an optional function that is called as soon as the exe unit is ready
+   * @param options.teardown - an optional function that is called before the exe unit is destroyed
    */
-  async oneOf(order: MarketOrderSpec, signalOrTimeout?: number | AbortSignal): Promise<ResourceRental> {
+  async oneOf({ order, setup, teardown, signalOrTimeout }: OneOfOptions): Promise<ResourceRental> {
     const proposalPool = new DraftOfferProposalPool({
       logger: this.logger,
       validateProposal: order.market.proposalFilter,
@@ -394,6 +406,7 @@ export class GolemNetwork {
       payment: order.payment,
       activity: order.activity,
       networkNode,
+      exeUnit: { setup, teardown },
     });
 
     // We managed to create the activity, no need to look for more agreement candidates
@@ -453,9 +466,13 @@ export class GolemNetwork {
    * ]);
    * ```
    *
-   * @param options Demand specification and concurrency level
+   * @param @param {Object} options
+   * @param options.order - represents the order specifications which will result in access to LeaseProcess.
+   * @param options.concurrency - concurrency level, can be defined as a number or an object with min and max fields
+   * @param options.setup - an optional function that is called as soon as the exe unit is ready
+   * @param options.teardown - an optional function that is called before the exe unit is destroyed
    */
-  public async manyOf({ concurrency, order }: ManyOfOptions): Promise<ResourceRentalPool> {
+  public async manyOf({ concurrency, order, setup, teardown }: ManyOfOptions): Promise<ResourceRentalPool> {
     const proposalPool = new DraftOfferProposalPool({
       logger: this.logger,
       validateProposal: order.market.proposalFilter,
@@ -478,6 +495,7 @@ export class GolemNetwork {
       resourceRentalOptions: {
         activity: order.activity,
         payment: order.payment,
+        exeUnit: { setup, teardown },
       },
       agreementOptions: {
         expirationSec: order.market.rentHours * 60 * 60,
diff --git a/tests/unit/agreement.test.ts b/src/market/agreement/agreement.test.ts
similarity index 94%
rename from tests/unit/agreement.test.ts
rename to src/market/agreement/agreement.test.ts
index ba484ad91..0e7eb62ca 100644
--- a/tests/unit/agreement.test.ts
+++ b/src/market/agreement/agreement.test.ts
@@ -1,4 +1,4 @@
-import { Agreement, Demand, DemandSpecification, ProviderInfo } from "../../src";
+import { Agreement, Demand, DemandSpecification } from "../index";
 import { MarketApi } from "ya-ts-client";
 
 const agreementData: MarketApi.AgreementDTO = {
diff --git a/tests/unit/decorations_builder.test.ts b/src/market/demand/demand-body-builder.test.ts
similarity index 96%
rename from tests/unit/decorations_builder.test.ts
rename to src/market/demand/demand-body-builder.test.ts
index ecff29aa6..3c525b4af 100644
--- a/tests/unit/decorations_builder.test.ts
+++ b/src/market/demand/demand-body-builder.test.ts
@@ -1,5 +1,5 @@
-import { ComparisonOperator, DemandBodyBuilder } from "../../src/market/demand/demand-body-builder";
-import { GolemInternalError } from "../../src/shared/error/golem-error";
+import { ComparisonOperator, DemandBodyBuilder } from "./demand-body-builder";
+import { GolemInternalError } from "../../shared/error/golem-error";
 
 describe("#DecorationsBuilder()", () => {
   describe("addProperty()", () => {
diff --git a/tests/unit/allocation.test.ts b/src/payment/allocation.test.ts
similarity index 95%
rename from tests/unit/allocation.test.ts
rename to src/payment/allocation.test.ts
index e86d69ce7..3b73f6ca4 100644
--- a/tests/unit/allocation.test.ts
+++ b/src/payment/allocation.test.ts
@@ -1,4 +1,4 @@
-import { Allocation, GolemConfigError, YagnaApi } from "../../src";
+import { Allocation, GolemConfigError, YagnaApi } from "../index";
 import { anything, imock, instance, mock, reset, when } from "@johanblumenberg/ts-mockito";
 import { PaymentApi } from "ya-ts-client";
 
diff --git a/src/resource-rental/resource-rental-pool.ts b/src/resource-rental/resource-rental-pool.ts
index 4dce07015..8593c12b3 100644
--- a/src/resource-rental/resource-rental-pool.ts
+++ b/src/resource-rental/resource-rental-pool.ts
@@ -191,7 +191,7 @@ export class ResourceRentalPool {
   /**
    * Borrow a resource rental from the pool.
    * If there is no valid resource rental a new one will be created.
-   * @param signalOrTimeout - the timeout in milliseconds or an AbortSignal that will be used to cancel the lease request
+   * @param signalOrTimeout - the timeout in milliseconds or an AbortSignal that will be used to cancel the rental request
    */
   async acquire(signalOrTimeout?: number | AbortSignal): Promise<ResourceRental> {
     if (this.isDraining) {
@@ -369,11 +369,11 @@ export class ResourceRentalPool {
    *  // even if an error is thrown in the callback
    * });
    * ```
-   * @param callback - a function that takes a `lease` object as its argument. The lease is automatically released after the callback is executed, regardless of whether it completes successfully or throws an error.
-   * @param signalOrTimeout - the timeout in milliseconds or an AbortSignal that will be used to cancel the lease request
+   * @param callback - a function that takes a `rental` object as its argument. The renatl is automatically released after the callback is executed, regardless of whether it completes successfully or throws an error.
+   * @param signalOrTimeout - the timeout in milliseconds or an AbortSignal that will be used to cancel the rental request
    */
   public async withRental<T>(
-    callback: (lease: ResourceRental) => Promise<T>,
+    callback: (rental: ResourceRental) => Promise<T>,
     signalOrTimeout?: number | AbortSignal,
   ): Promise<T> {
     const rental = await this.acquire(signalOrTimeout);
diff --git a/src/resource-rental/resource-rental.ts b/src/resource-rental/resource-rental.ts
index b4d33173d..4cc63fe55 100644
--- a/src/resource-rental/resource-rental.ts
+++ b/src/resource-rental/resource-rental.ts
@@ -2,7 +2,7 @@ import { Agreement } from "../market/agreement/agreement";
 import { AgreementPaymentProcess, PaymentProcessOptions } from "../payment/agreement_payment_process";
 import { Logger } from "../shared/utils";
 import { waitForCondition } from "../shared/utils/wait";
-import { ActivityModule, WorkContext } from "../activity";
+import { ActivityModule, ExeUnit, ExeUnitOptions } from "../activity";
 import { StorageProvider } from "../shared/storage";
 import { EventEmitter } from "eventemitter3";
 import { NetworkNode } from "../network";
@@ -18,6 +18,7 @@ export interface ResourceRentalEvents {
 }
 
 export interface ResourceRentalOptions {
+  exeUnit?: Pick<ExeUnitOptions, "setup" | "teardown" | "activityDeployingTimeout">;
   activity?: ExecutionOptions;
   payment?: Partial<PaymentProcessOptions>;
   networkNode?: NetworkNode;
@@ -30,7 +31,7 @@ export class ResourceRental {
   public readonly events = new EventEmitter<ResourceRentalEvents>();
   public readonly networkNode?: NetworkNode;
 
-  private currentWorkContext: WorkContext | null = null;
+  private currentExeUnit: ExeUnit | null = null;
   private abortController = new AbortController();
   private finalizePromise?: Promise<void>;
 
@@ -57,18 +58,22 @@ export class ResourceRental {
     // Prevent this task from being performed more than once
     if (!this.finalizePromise) {
       this.finalizePromise = (async () => {
-        this.abortController.abort("The lease process is finalizing");
-        if (this.paymentProcess.isFinished()) {
-          return;
-        }
         try {
-          this.logger.info("Waiting for payment process of agreement to finish", { agreementId: this.agreement.id });
-          if (this.currentWorkContext) {
-            await this.activityModule.destroyActivity(this.currentWorkContext.activity);
+          if (this.currentExeUnit) {
+            await this.currentExeUnit.teardown();
+          }
+          this.abortController.abort("The resource rental is finalizing");
+          if (this.currentExeUnit?.activity) {
+            await this.activityModule.destroyActivity(this.currentExeUnit.activity);
           }
           if ((await this.fetchAgreementState()) !== "Terminated") {
             await this.marketModule.terminateAgreement(this.agreement);
           }
+          if (this.paymentProcess.isFinished()) {
+            return;
+          }
+
+          this.logger.info("Waiting for payment process of agreement to finish", { agreementId: this.agreement.id });
           await waitForCondition(() => this.paymentProcess.isFinished());
           this.logger.info("Payment process for agreement finalized", { agreementId: this.agreement.id });
         } catch (error) {
@@ -83,35 +88,36 @@ export class ResourceRental {
   }
 
   public hasActivity(): boolean {
-    return this.currentWorkContext !== null;
+    return this.currentExeUnit !== null;
   }
 
   /**
-   * Creates an activity on the Provider, and returns a work context that can be used to operate within the activity
+   * Creates an activity on the Provider, and returns a exe-unit that can be used to operate within the activity
    */
-  async getExeUnit(): Promise<WorkContext> {
+  async getExeUnit(): Promise<ExeUnit> {
     if (this.finalizePromise || this.abortController.signal.aborted) {
-      throw new GolemUserError("The lease process is not active. It may have been aborted or finalized");
+      throw new GolemUserError("The resource rental is not active. It may have been aborted or finalized");
     }
-    if (this.currentWorkContext) {
-      return this.currentWorkContext;
+    if (this.currentExeUnit) {
+      return this.currentExeUnit;
     }
 
     const activity = await this.activityModule.createActivity(this.agreement);
-    this.currentWorkContext = await this.activityModule.createWorkContext(activity, {
+    this.currentExeUnit = await this.activityModule.createExeUnit(activity, {
       storageProvider: this.storageProvider,
       networkNode: this.resourceRentalOptions?.networkNode,
-      execution: { ...this.resourceRentalOptions?.activity },
+      executionOptions: this.resourceRentalOptions?.activity,
       signalOrTimeout: this.abortController.signal,
+      ...this.resourceRentalOptions?.exeUnit,
     });
 
-    return this.currentWorkContext;
+    return this.currentExeUnit;
   }
 
   async destroyExeUnit() {
-    if (this.currentWorkContext) {
-      await this.activityModule.destroyActivity(this.currentWorkContext.activity);
-      this.currentWorkContext = null;
+    if (this.currentExeUnit) {
+      await this.activityModule.destroyActivity(this.currentExeUnit.activity);
+      this.currentExeUnit = null;
     } else {
       throw new Error(`There is no activity to destroy.`);
     }
diff --git a/tests/unit/ws-browser.spec.ts b/src/shared/storage/ws-browser.test.ts
similarity index 97%
rename from tests/unit/ws-browser.spec.ts
rename to src/shared/storage/ws-browser.test.ts
index e51affa42..1d30cc987 100644
--- a/tests/unit/ws-browser.spec.ts
+++ b/src/shared/storage/ws-browser.test.ts
@@ -1,10 +1,11 @@
-import { GolemInternalError, Logger, nullLogger, WebSocketBrowserStorageProvider, YagnaApi } from "../../src";
+// TODO: improve mocks - remove as any
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { GolemInternalError, Logger, nullLogger, WebSocketBrowserStorageProvider, YagnaApi } from "../../index";
 // .js added for ESM compatibility
 import { encode, toObject } from "flatbuffers/js/flexbuffers.js";
 import * as jsSha3 from "js-sha3";
-import { TEST_IDENTITY } from "../fixtures";
 import { GsbApi, IdentityApi } from "ya-ts-client";
-import { anything, imock, instance, mock, reset, resetCalls, verify, when } from "@johanblumenberg/ts-mockito";
+import { anything, imock, instance, mock, reset, verify, when } from "@johanblumenberg/ts-mockito";
 
 jest.mock("uuid", () => ({ v4: () => "uuid" }));
 
@@ -15,6 +16,7 @@ const mockIdentity = mock(IdentityApi.DefaultService);
 const mockGsb = mock(GsbApi.RequestorService);
 const logger = imock<Logger>();
 const yagnaApi = instance(mockYagna);
+const TEST_IDENTITY = "0x19ee20228a4c4bf8d4aebc79d9d3af2a01433456";
 
 describe("WebSocketBrowserStorageProvider", () => {
   const createProvider = () =>
diff --git a/tests/unit/env_utils.test.ts b/src/shared/utils/env.test.ts
similarity index 97%
rename from tests/unit/env_utils.test.ts
rename to src/shared/utils/env.test.ts
index 6cbbd9ad6..06052ee82 100644
--- a/tests/unit/env_utils.test.ts
+++ b/src/shared/utils/env.test.ts
@@ -1,4 +1,4 @@
-import { EnvUtils } from "../../src/shared/utils";
+import { EnvUtils } from "./index";
 
 describe("EnvUtils", () => {
   describe("getYagnaApiUrl()", () => {
diff --git a/tests/e2e/express.spec.ts b/tests/e2e/express.spec.ts
index 6832eec47..bbe631076 100644
--- a/tests/e2e/express.spec.ts
+++ b/tests/e2e/express.spec.ts
@@ -57,9 +57,9 @@ describe("Express", function () {
         consoleSpy("Job succeeded", job.results);
       });
 
-      job.startWork(async (ctx) => {
+      job.startWork(async (exe) => {
         const fileName = `EXPRESS_SPEC_OUTPUT.wav`;
-        await ctx
+        await exe
           .beginBatch()
           .run(`espeak "${req.body}" -w /golem/output/output.wav`)
           .downloadFile("/golem/output/output.wav", fileName)
diff --git a/tests/examples/examples.json b/tests/examples/examples.json
index 3aad9f743..e33bfd880 100644
--- a/tests/examples/examples.json
+++ b/tests/examples/examples.json
@@ -11,6 +11,7 @@
   { "cmd": "tsx", "path": "examples/advanced/proposal-predefined-filter.ts" },
   { "cmd": "tsx", "path": "examples/advanced/override-module.ts" },
   { "cmd": "tsx", "path": "examples/advanced/reuse-allocation.ts" },
+  { "cmd": "tsx", "path": "examples/advanced/setup-and-teardown.ts" },
   { "cmd": "tsx", "path": "examples/experimental/deployment/new-api.ts" },
   { "cmd": "tsx", "path": "examples/experimental/job/getJobById.ts" },
   { "cmd": "tsx", "path": "examples/experimental/job/waitForResults.ts" },
diff --git a/tests/fixtures/agreements.ts b/tests/fixtures/agreements.ts
deleted file mode 100644
index 783ce65ef..000000000
--- a/tests/fixtures/agreements.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-export const agreementsApproved = [
-  {
-    agreementId: "b9ef6f5feb7fa9e5eb226a5ca2b658823242451fa28b08df9e063943018cc883",
-    demand: {
-      properties: {
-        "golem.com.payment.chosen-platform": "erc20-rinkeby-tglm",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-        "golem.node.debug.subnet": "devnet-beta",
-        "golem.srv.caps.multi-activity": true,
-        "golem.srv.comp.expiration": 1669632825572,
-        "golem.srv.comp.task_package":
-          "hash:sha3:9a3b5d67b0b27746283cb5f287c13eab1beaa12d92a9f536b747c7ae:http://girepo.dev.golem.network:8000/local-image-c76719083b.gvmi\n",
-        "golem.srv.comp.vm.package_format": "gvmkit-squash",
-      },
-      constraints:
-        "(&(&(golem.inf.mem.gib>=0.5)\n\t(golem.inf.storage.gib>=2)\n\t(golem.runtime.name=vm))\n\t(golem.com.payment.platform.erc20-rinkeby-tglm.address=*)\n\t(golem.node.debug.subnet=devnet-beta))",
-      demandId: "f8a7f2ac2e034123b59fdd45993ccb0e-7b25faa576ea7696a27775b6058470fedbfe9b4f86fc808de4a12ddffdef4811",
-      requestorId: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-      timestamp: "2022-11-28T10:38:57.369763Z",
-    },
-    offer: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["gftp", "http", "https"],
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x6e7f25ca8ab5a043d91d102116cc97c2654403f0",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x6e7f25ca8ab5a043d91d102116cc97c2654403f0",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x6e7f25ca8ab5a043d91d102116cc97c2654403f0",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x6e7f25ca8ab5a043d91d102116cc97c2654403f0",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.0001, 0.00005, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.usage.vector": ["golem.usage.cpu_sec", "golem.usage.duration_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-7700 CPU @ 3.60GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 9 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "devnet-beta",
-        "golem.node.id.name": "azathoth-rnd",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994555408)\n  (golem.node.debug.subnet=devnet-beta)\n)",
-      offerId: "7d322a0eb074438b86c80973ac7d0cbf-e03ec4bc0f723f5332c1ddf7ebcc4b689bcf772c346ab608e75611320283993f",
-      providerId: "0x6e7f25ca8ab5a043d91d102116cc97c2654403f0",
-      timestamp: "2022-11-28T10:38:57.369763Z",
-    },
-    validTo: "2022-11-28T11:38:57.357Z",
-    approvedDate: "2022-11-28T10:38:57.517431370Z",
-    state: "Approved",
-    timestamp: "2022-11-28T10:38:57.369763Z",
-    proposedSignature: "NoSignature",
-    approvedSignature: "NoSignature",
-    committedSignature: "NoSignature",
-  },
-];
diff --git a/tests/fixtures/allocations.ts b/tests/fixtures/allocations.ts
deleted file mode 100644
index e02852e35..000000000
--- a/tests/fixtures/allocations.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export const allocations = [
-  {
-    allocationId: "70000034-020b-40a0-8adc-404be7440beb",
-    address: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-    paymentPlatform: "erc20-holesky-tglm",
-    totalAmount: "1",
-    spentAmount: "0",
-    remainingAmount: "1",
-    timestamp: "2022-11-24T08:49:05.480Z",
-    timeout: "2022-11-24T09:09:05.415Z",
-    makeDeposit: false,
-  },
-];
diff --git a/tests/fixtures/debit_notes.ts b/tests/fixtures/debit_notes.ts
deleted file mode 100644
index 925d06f3b..000000000
--- a/tests/fixtures/debit_notes.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PaymentApi } from "ya-ts-client";
-
-export const debitNotesEvents: PaymentApi.DebitNoteRejectedEventDTO[] = [
-  {
-    debitNoteId: "39c20b22-9c49-47cf-b7f9-a4d80f67b915",
-    eventDate: "2022-12-05T08:54:31.833Z",
-    eventType: "DebitNoteReceivedEvent",
-  },
-];
-
-export const debitNotes: PaymentApi.DebitNoteDTO[] = [
-  {
-    debitNoteId: "39c20b22-9c49-47cf-b7f9-a4d80f67b915",
-    issuerId: "0xd9a4a6ba9e1800e4f61cd88dc23f082527f4ee28",
-    recipientId: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-    payeeAddr: "0xd9a4a6ba9e1800e4f61cd88dc23f082527f4ee28",
-    payerAddr: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-    paymentPlatform: "erc20-holesky-tglm",
-    timestamp: "2022-12-05T08:54:31.831Z",
-    agreementId: "test_agreement_id",
-    activityId: "00f36a80a8544260acbf4b09dc46f4fc",
-    totalAmountDue: "0.000869307866200000",
-    usageCounterVector: [0.188735, 17.008687324],
-    status: "RECEIVED",
-  },
-];
diff --git a/tests/fixtures/eiffel.blend b/tests/fixtures/eiffel.blend
deleted file mode 100644
index 34814e532..000000000
Binary files a/tests/fixtures/eiffel.blend and /dev/null differ
diff --git a/tests/fixtures/identity.ts b/tests/fixtures/identity.ts
deleted file mode 100644
index f322ce835..000000000
--- a/tests/fixtures/identity.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const TEST_IDENTITY = "0x19ee20228a4c4bf8d4aebc79d9d3af2a01433456";
diff --git a/tests/fixtures/index.ts b/tests/fixtures/index.ts
deleted file mode 100644
index a98f70fc8..000000000
--- a/tests/fixtures/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export { agreementsApproved } from "./agreements";
-export { allocations } from "./allocations";
-export {
-  proposalsInitial,
-  proposalsDraft,
-  proposalsWrongPaymentPlatform,
-  proposalsShortDebitNoteTimeout,
-} from "./proposals";
-export { TEST_IDENTITY } from "./identity";
-export { invoiceEvents, invoices } from "./invoices";
-export { debitNotes, debitNotesEvents } from "./debit_notes";
diff --git a/tests/fixtures/invoices.ts b/tests/fixtures/invoices.ts
deleted file mode 100644
index 8d87def83..000000000
--- a/tests/fixtures/invoices.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { PaymentApi } from "ya-ts-client";
-
-export const invoiceEvents: PaymentApi.InvoiceReceivedEventDTO[] = [
-  {
-    invoiceId: "f2f5a229-8324-4211-973a-346e45b3d3e2",
-    eventDate: "2022-12-05T08:54:31.930Z",
-    eventType: "InvoiceReceivedEvent",
-  },
-];
-
-export const invoices: PaymentApi.InvoiceDTO[] = [
-  {
-    invoiceId: "f2f5a229-8324-4211-973a-346e45b3d3e2",
-    issuerId: "0xd9a4a6ba9e1800e4f61cd88dc23f082527f4ee28",
-    recipientId: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-    payeeAddr: "0xd9a4a6ba9e1800e4f61cd88dc23f082527f4ee28",
-    payerAddr: "0x19ee20338a4c4bf8f6aebc79d9d3af2a01434119",
-    paymentPlatform: "erc20-holesky-tglm",
-    timestamp: "2022-12-05T08:54:31.927Z",
-    agreementId: "test_agreement_id",
-    activityIds: ["00f36a80a8544260acbf4b09dc46f4fc"],
-    amount: "0.000869307866200000",
-    paymentDueDate: "2022-12-06T08:54:31.941822231Z",
-    status: "RECEIVED",
-  },
-];
diff --git a/tests/fixtures/proposals.ts b/tests/fixtures/proposals.ts
deleted file mode 100644
index 31ae0aa2b..000000000
--- a/tests/fixtures/proposals.ts
+++ /dev/null
@@ -1,1457 +0,0 @@
-import { MarketApi } from "ya-ts-client";
-
-export const proposalsInitial: MarketApi.ProposalEventDTO[] = [
-  // 0
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:05.761Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "golem2004",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994561269)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-20a722b5aa370c2ce25fa2621143541ee17fc8654e54ecdd76dd4e76bb83f476",
-      issuerId: "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:05.760367Z",
-    },
-  },
-  // 1
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:22:11.470Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x79d38971d4a484d07925b5919aaf7cab807696f4",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x79d38971d4a484d07925b5919aaf7cab807696f4",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x79d38971d4a484d07925b5919aaf7cab807696f4",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x79d38971d4a484d07925b5919aaf7cab807696f4",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "fbwk2t2",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994556583)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-4301c24faa9776388ccf49837b2c60986a039a54c9310592c74908cf3fcd58a0",
-      issuerId: "0x79d38971d4a484d07925b5919aaf7cab807696f4",
-      state: "Initial",
-      timestamp: "2022-11-24T08:22:11.469747Z",
-    },
-  },
-  // 2
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:41.400Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x3a8052f782c55f96be7ffbce22587ed917ad98b9",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x3a8052f782c55f96be7ffbce22587ed917ad98b9",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x3a8052f782c55f96be7ffbce22587ed917ad98b9",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x3a8052f782c55f96be7ffbce22587ed917ad98b9",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.0001, 0.00005, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.cpu_sec", "golem.usage.duration_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "michal",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994551780)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-f6224492cb90e492135b9720d8ff8ea0928335357bf1a08b0abfe45dee2103fe",
-      issuerId: "0x3a8052f782c55f96be7ffbce22587ed917ad98b9",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:41.399655Z",
-    },
-  },
-  // 3
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:42.270Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["https", "http", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 9 Family 6 Model 302",
-        "golem.inf.cpu.threads": 2,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 8,
-        "golem.inf.storage.gib": 100,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "q53",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994554487)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-96e1f6c59e542dfb5602af5022030f6ce2208f2e702c571888d9aeeabd621fc9",
-      issuerId: "0x44df807cd832393b254378ec33efb65adee837b8",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:42.270199Z",
-    },
-  },
-  // 4
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:46.446Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["https", "http", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "deprecate_fpu_cs_ds",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 3 Family 6 Model 108",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "sharkoon_378",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994563392)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-b50df314ed6c2c7710047d445ec5ecc256892c5b7515c3a09461de7fdb27f73e",
-      issuerId: "0x700e83ffc421d43f95c340774d5816b985fcf804",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:46.445758Z",
-    },
-  },
-  // 5
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:22:05.788Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.0001, 0.00005, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.cpu_sec", "golem.usage.duration_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 9 Family 6 Model 302",
-        "golem.inf.cpu.threads": 2,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 8,
-        "golem.inf.storage.gib": 100,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "jiuzhang",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994648654)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-2eea8fd0bb37efee7ac1ab9b8c3c08f69e61fca5c3922a1c5e966773a609bc2d",
-      issuerId: "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-      state: "Initial",
-      timestamp: "2022-11-24T08:22:05.787609Z",
-    },
-  },
-  // 6 - invalid payment platform
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:22:05.788Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.erc20-invalid1.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.erc20--invalid2-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.erc20--invalid3-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.payment.platform.zksync--invalid4-tglm.address": "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.0001, 0.00005, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.cpu_sec", "golem.usage.duration_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 9 Family 6 Model 302",
-        "golem.inf.cpu.threads": 2,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 8,
-        "golem.inf.storage.gib": 100,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "jiuzhang",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994648654)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-2eea8fd0bb37efee7ac1ab9b8c3c08f69e61fca5c3922a1c5e966773a609bc2d",
-      issuerId: "0x4316e60d7154a99b16d4cd43202017983cdb6bcb",
-      state: "Initial",
-      timestamp: "2022-11-24T08:22:05.787609Z",
-    },
-  },
-];
-
-export const proposalsDraft: MarketApi.ProposalEventDTO[] = [
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:22:40.471Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "golem2004",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994561269)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-818ed14e04477af6ead7aacd7c03ee3bfebadaf5b26924dcb54ae7c2b78274cd",
-      issuerId: "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-      state: "Draft",
-      timestamp: "2022-11-24T08:22:40.486195451Z",
-      prevProposalId: "R-49263a0d6627e42a3df6650dd513be7748f680d6a119eab0c06f5b118da170c9",
-    },
-  },
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:26:09.068Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["https", "http", "gftp"],
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x44df807cd832393b254378ec33efb65adee837b8",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Xeon(R) CPU E3-1270 v6 @ 3.80GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 9 Family 6 Model 302",
-        "golem.inf.cpu.threads": 2,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 8,
-        "golem.inf.storage.gib": 100,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "q53",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994554487)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-bc5a613cf03260bb163bdc4343f5c2d783f36ad2ff3eeca07bb7651f7301eec9",
-      issuerId: "0x44df807cd832393b254378ec33efb65adee837b8",
-      state: "Draft",
-      timestamp: "2022-11-24T08:26:09.091332272Z",
-      prevProposalId: "R-595633882f910f59f9422da6581628657d9a598757a4d1564ed5c1850e1ea7f1",
-    },
-  },
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:26:09.155Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["https", "http", "gftp"],
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0x700e83ffc421d43f95c340774d5816b985fcf804",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "deprecate_fpu_cs_ds",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 3 Family 6 Model 108",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "sharkoon_378",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994563392)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-de45ac1f188cc45a7800fced225a18bc65168f9c9d0e780c2d75962b834aab38",
-      issuerId: "0x700e83ffc421d43f95c340774d5816b985fcf804",
-      state: "Draft",
-      timestamp: "2022-11-24T08:26:09.139536649Z",
-      prevProposalId: "R-4e84f800b07564757b6c952946e1019d89633b999c992356efaee23be7aa92a4",
-    },
-  },
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:26:43.283Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["gftp", "https", "http"],
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0xccf5d4e9f6dcfc553e7a4ba6a08b8b3e4fd785a2",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0xccf5d4e9f6dcfc553e7a4ba6a08b8b3e4fd785a2",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0xccf5d4e9f6dcfc553e7a4ba6a08b8b3e4fd785a2",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0xccf5d4e9f6dcfc553e7a4ba6a08b8b3e4fd785a2",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.0001, 0.00005, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.usage.vector": ["golem.usage.cpu_sec", "golem.usage.duration_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "deprecate_fpu_cs_ds",
-        ],
-        "golem.inf.cpu.cores": 4,
-        "golem.inf.cpu.model": "Stepping 3 Family 6 Model 108",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "sharkoon_379",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994562764)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-5dcfc5bff6348573ea4512f23125d21275db1c158a6816ac3ed83ae3ba518d92",
-      issuerId: "0xccf5d4e9f6dcfc553e7a4ba6a08b8b3e4fd785a2",
-      state: "Draft",
-      timestamp: "2022-11-24T08:26:43.307984303Z",
-      prevProposalId: "R-bc46f25fe3cdfd5af890d6dd64d8e664680dcd51e0c479ca4cabd022ce1e5c8f",
-    },
-  },
-];
-
-export const proposalsWrongPaymentPlatform: MarketApi.ProposalEventDTO[] = [
-  // 0
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:05.761Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 240,
-        "golem.com.payment.platform.wrong1.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.wrong2.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "golem2004",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994561269)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-20a722b5aa370c2ce25fa2621143541ee17fc8654e54ecdd76dd4e76bb83f476",
-      issuerId: "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:05.760367Z",
-    },
-  },
-];
-
-export const proposalsShortDebitNoteTimeout: MarketApi.ProposalEventDTO[] = [
-  // 0
-  {
-    eventType: "ProposalEvent",
-    eventDate: "2022-11-24T08:21:05.761Z",
-    proposal: {
-      properties: {
-        "golem.activity.caps.transfer.protocol": ["http", "https", "gftp"],
-        "golem.com.payment.debit-notes.accept-timeout?": 15,
-        "golem.com.payment.platform.erc20-holesky-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-mumbai-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.erc20-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.payment.platform.zksync-rinkeby-tglm.address": "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-        "golem.com.pricing.model": "linear",
-        "golem.com.pricing.model.linear.coeffs": [0.00005, 0.0001, 0],
-        "golem.com.scheme": "payu",
-        "golem.com.scheme.payu.debit-note.interval-sec?": 120,
-        "golem.com.scheme.payu.payment-timeout-sec?": 120,
-        "golem.com.usage.vector": ["golem.usage.duration_sec", "golem.usage.cpu_sec"],
-        "golem.inf.cpu.architecture": "x86_64",
-        "golem.inf.cpu.brand": "Intel(R) Core(TM) i7-8700 CPU @ 3.20GHz",
-        "golem.inf.cpu.capabilities": [
-          "sse3",
-          "pclmulqdq",
-          "dtes64",
-          "monitor",
-          "dscpl",
-          "vmx",
-          "smx",
-          "eist",
-          "tm2",
-          "ssse3",
-          "fma",
-          "cmpxchg16b",
-          "pdcm",
-          "pcid",
-          "sse41",
-          "sse42",
-          "x2apic",
-          "movbe",
-          "popcnt",
-          "tsc_deadline",
-          "aesni",
-          "xsave",
-          "osxsave",
-          "avx",
-          "f16c",
-          "rdrand",
-          "fpu",
-          "vme",
-          "de",
-          "pse",
-          "tsc",
-          "msr",
-          "pae",
-          "mce",
-          "cx8",
-          "apic",
-          "sep",
-          "mtrr",
-          "pge",
-          "mca",
-          "cmov",
-          "pat",
-          "pse36",
-          "clfsh",
-          "ds",
-          "acpi",
-          "mmx",
-          "fxsr",
-          "sse",
-          "sse2",
-          "ss",
-          "htt",
-          "tm",
-          "pbe",
-          "fsgsbase",
-          "adjust_msr",
-          "bmi1",
-          "hle",
-          "avx2",
-          "smep",
-          "bmi2",
-          "rep_movsb_stosb",
-          "invpcid",
-          "rtm",
-          "deprecate_fpu_cs_ds",
-          "mpx",
-          "rdseed",
-          "adx",
-          "smap",
-          "clflushopt",
-          "processor_trace",
-          "sgx",
-          "sgx_lc",
-        ],
-        "golem.inf.cpu.cores": 6,
-        "golem.inf.cpu.model": "Stepping 10 Family 6 Model 302",
-        "golem.inf.cpu.threads": 1,
-        "golem.inf.cpu.vendor": "GenuineIntel",
-        "golem.inf.mem.gib": 4,
-        "golem.inf.storage.gib": 20,
-        "golem.node.debug.subnet": "public",
-        "golem.node.id.name": "golem2004",
-        "golem.runtime.capabilities": ["vpn"],
-        "golem.runtime.name": "vm",
-        "golem.runtime.version": "0.2.11",
-        "golem.srv.caps.multi-activity": true,
-      },
-      constraints: "(&\n  (golem.srv.comp.expiration>1667994561269)\n  (golem.node.debug.subnet=public)\n)",
-      proposalId: "R-20a722b5aa370c2ce25fa2621143541ee17fc8654e54ecdd76dd4e76bb83f476",
-      issuerId: "0xee8993fe1dcff6b131d3fd759c6b3ddcb82d1655",
-      state: "Initial",
-      timestamp: "2022-11-24T08:21:05.760367Z",
-    },
-  },
-];
diff --git a/tests/unit/jest.config.json b/tests/jest.config.json
similarity index 82%
rename from tests/unit/jest.config.json
rename to tests/jest.config.json
index 8df405883..702e07f36 100644
--- a/tests/unit/jest.config.json
+++ b/tests/jest.config.json
@@ -1,9 +1,9 @@
 {
   "preset": "ts-jest",
   "testEnvironment": "node",
-  "roots": ["../../src", "./"],
+  "roots": ["../src"],
   "testMatch": ["**/*.test.ts", "**/*.spec.ts"],
-  "setupFilesAfterEnv": ["../jest.setup.ts"],
+  "setupFilesAfterEnv": ["./jest.setup.ts"],
   "reporters": [
     "default",
     [
diff --git a/tests/unit/helpers.ts b/tests/utils/helpers.ts
similarity index 97%
rename from tests/unit/helpers.ts
rename to tests/utils/helpers.ts
index 89557e153..45deab00b 100644
--- a/tests/unit/helpers.ts
+++ b/tests/utils/helpers.ts
@@ -1,4 +1,3 @@
-import { ActivityApi } from "ya-ts-client";
 import { Readable } from "stream";
 import { Result, ResultData } from "../../src/activity/results";