diff --git a/.gitignore b/.gitignore
index 9874d425c..91d932d8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,4 +151,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 llama-*
-vicuna-*
\ No newline at end of file
+vicuna-*
+
+# mac
+.DS_Store
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index 54cc11170..000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-For now there aren't many tests.
-So just run:
-
-```
-python tests/unit/json_tests.py
-python tests/integration/memory_tests.py
-```
-
-paid test:
-```
-python tests/integration/test_commands.py 
-```
-This test costs 0.004$ per run with GPT-3.5. We will setup a pipeline in github action to allow people to run these tests for free.
-
-The pipeline will be be triggered for now.
-
-TODO: when we setup pytest, replace lines above by: pytest commands
diff --git a/tests/integration/test_commands.py b/tests/smoke_test.py
similarity index 73%
rename from tests/integration/test_commands.py
rename to tests/smoke_test.py
index 26413437f..1f0f24f90 100644
--- a/tests/integration/test_commands.py
+++ b/tests/smoke_test.py
@@ -1,18 +1,9 @@
-import contextlib
 import os
 import subprocess
 import sys
-import time
-from pathlib import Path
 import unittest
-import platform
 
-# Import necessary modules for testing, file operations, and handling system paths.
-
-root_path = Path(__file__).resolve().parent.parent.parent
-sys.path.append(str(root_path / 'scripts'))
-from file_operations import read_file
-from file_operations import delete_file
+from autogpt.file_operations import delete_file, read_file
 
 env_vars = {
     'MEMORY_BACKEND': 'no_memory',
@@ -28,18 +19,15 @@ class TestCommands(unittest.TestCase):
 
         # Read the current ai_settings.yaml file and store its content.
         ai_settings = None
-        with contextlib.suppress(Exception):
+        if os.path.exists('ai_settings.yaml'):
             with open('ai_settings.yaml', 'r') as f:
                 ai_settings = f.read()
+            os.remove('ai_settings.yaml')
 
         try:
-            with contextlib.suppress(Exception):
+            if os.path.exists('hello_world.txt'):
                 # Clean up any existing 'hello_world.txt' file before testing.
                 delete_file('hello_world.txt')
-
-                # Remove ai_settings.yaml file to avoid continuing from the previous session.
-                os.remove('ai_settings.yaml')
-
             # Prepare input data for the test.
             input_data = '''write_file-GPT
 an AI designed to use the write_file command to write 'Hello World' into a file named "hello_world.txt" and then use the task_complete command to complete the task.
@@ -49,8 +37,7 @@ Do not use any other commands.
 
 y -5
 EOF'''
-            script_path = root_path / 'scripts' / 'main.py'
-            command = f'{sys.executable} {script_path}'
+            command = f'{sys.executable} -m autogpt'
 
             # Execute the script with the input data.
             process = subprocess.Popen(command, stdin=subprocess.PIPE, shell=True, env={**os.environ, **env_vars})
diff --git a/tests/unit/json_tests.py b/tests/unit/json_tests.py
index 4899f265f..561b8a38a 100644
--- a/tests/unit/json_tests.py
+++ b/tests/unit/json_tests.py
@@ -1,16 +1,6 @@
 import unittest
-<<<<<<< HEAD
 
 from autogpt.json_parser import fix_and_parse_json
-=======
-import os
-import sys
-from pathlib import Path
-
-# Probably a better way:
-sys.path.append(str(Path(__file__).resolve().parent.parent.parent / 'scripts'))
-from json_parser import fix_and_parse_json
->>>>>>> 27e0703d (Update sys.path to use pathlib in json_tests.py)
 
 
 class TestParseJson(unittest.TestCase):