diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 32ecebfe2..93b9e24db 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,7 +65,7 @@ This "editable" mode lets you edit the source without needing to reinstall the p
 Use the builtin unittest package:
 
 ```
- python -m unittest discover --pattern '*test*.py'
+ python -m unittest
 ```
 
 Or to debug, use:
diff --git a/tests/notebook/__init__.py b/tests/notebook/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/notebook/lib/__init__.py b/tests/notebook/lib/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/notebook/lib/llm_function_test.py b/tests/notebook/lib/test_llm_function.py
similarity index 100%
rename from tests/notebook/lib/llm_function_test.py
rename to tests/notebook/lib/test_llm_function.py
diff --git a/tests/notebook/lib/llmfn_output_row_test.py b/tests/notebook/lib/test_llmfn_output_row.py
similarity index 100%
rename from tests/notebook/lib/llmfn_output_row_test.py
rename to tests/notebook/lib/test_llmfn_output_row.py
diff --git a/tests/notebook/lib/llmfn_outputs_test.py b/tests/notebook/lib/test_llmfn_outputs.py
similarity index 100%
rename from tests/notebook/lib/llmfn_outputs_test.py
rename to tests/notebook/lib/test_llmfn_outputs.py
diff --git a/tests/notebook/lib/llmfn_post_process_cmds_test.py b/tests/notebook/lib/test_llmfn_post_process_cmds.py
similarity index 100%
rename from tests/notebook/lib/llmfn_post_process_cmds_test.py
rename to tests/notebook/lib/test_llmfn_post_process_cmds.py
diff --git a/tests/notebook/lib/prompt_utils_test.py b/tests/notebook/lib/test_prompt_utils.py
similarity index 100%
rename from tests/notebook/lib/prompt_utils_test.py
rename to tests/notebook/lib/test_prompt_utils.py
diff --git a/tests/notebook/argument_parser_test.py b/tests/notebook/test_argument_parser.py
similarity index 100%
rename from tests/notebook/argument_parser_test.py
rename to tests/notebook/test_argument_parser.py
diff --git a/tests/notebook/cmd_line_parser_test.py b/tests/notebook/test_cmd_line_parser.py
similarity index 100%
rename from tests/notebook/cmd_line_parser_test.py
rename to tests/notebook/test_cmd_line_parser.py
diff --git a/tests/notebook/flag_def_test.py b/tests/notebook/test_flag_def.py
similarity index 100%
rename from tests/notebook/flag_def_test.py
rename to tests/notebook/test_flag_def.py
diff --git a/tests/notebook/html_utils_test.py b/tests/notebook/test_html_utils.py
similarity index 100%
rename from tests/notebook/html_utils_test.py
rename to tests/notebook/test_html_utils.py
diff --git a/tests/notebook/magics_engine_test.py b/tests/notebook/test_magics_engine.py
similarity index 100%
rename from tests/notebook/magics_engine_test.py
rename to tests/notebook/test_magics_engine.py
diff --git a/tests/notebook/model_registry_test.py b/tests/notebook/test_model_registry.py
similarity index 100%
rename from tests/notebook/model_registry_test.py
rename to tests/notebook/test_model_registry.py
diff --git a/tests/notebook/post_process_utils_test.py b/tests/notebook/test_post_process_utils.py
similarity index 100%
rename from tests/notebook/post_process_utils_test.py
rename to tests/notebook/test_post_process_utils.py
diff --git a/tests/notebook/py_utils_test.py b/tests/notebook/test_py_utils.py
similarity index 100%
rename from tests/notebook/py_utils_test.py
rename to tests/notebook/test_py_utils.py
diff --git a/tests/notebook/sheets_id_test.py b/tests/notebook/test_sheets_id.py
similarity index 100%
rename from tests/notebook/sheets_id_test.py
rename to tests/notebook/test_sheets_id.py
diff --git a/tests/notebook/sheets_sanitize_url_test.py b/tests/notebook/test_sheets_sanitize_url.py
similarity index 100%
rename from tests/notebook/sheets_sanitize_url_test.py
rename to tests/notebook/test_sheets_sanitize_url.py
diff --git a/tests/notebook/input_utils_test.py b/tests/notebook/tet_input_utils.py
similarity index 100%
rename from tests/notebook/input_utils_test.py
rename to tests/notebook/tet_input_utils.py