diff --git a/GPy/testing/cython_tests.py b/GPy/testing/test_cython.py
similarity index 100%
rename from GPy/testing/cython_tests.py
rename to GPy/testing/test_cython.py
diff --git a/GPy/testing/ep_likelihood_tests.py b/GPy/testing/test_ep_likelihood.py
similarity index 100%
rename from GPy/testing/ep_likelihood_tests.py
rename to GPy/testing/test_ep_likelihood.py
diff --git a/GPy/testing/examples_tests.py b/GPy/testing/test_examples.py
similarity index 100%
rename from GPy/testing/examples_tests.py
rename to GPy/testing/test_examples.py
diff --git a/GPy/testing/gp_tests.py b/GPy/testing/test_gp.py
similarity index 100%
rename from GPy/testing/gp_tests.py
rename to GPy/testing/test_gp.py
diff --git a/GPy/testing/gpy_kernels_state_space_tests.py b/GPy/testing/test_gpy_kernels_state_space.py
similarity index 100%
rename from GPy/testing/gpy_kernels_state_space_tests.py
rename to GPy/testing/test_gpy_kernels_state_space.py
diff --git a/GPy/testing/grid_tests.py b/GPy/testing/test_grid.py
similarity index 100%
rename from GPy/testing/grid_tests.py
rename to GPy/testing/test_grid.py
diff --git a/GPy/testing/inference_tests.py b/GPy/testing/test_inference.py
similarity index 100%
rename from GPy/testing/inference_tests.py
rename to GPy/testing/test_inference.py
diff --git a/GPy/testing/kernel_tests.py b/GPy/testing/test_kernel.py
similarity index 100%
rename from GPy/testing/kernel_tests.py
rename to GPy/testing/test_kernel.py
diff --git a/GPy/testing/likelihood_tests.py b/GPy/testing/test_likelihood.py
similarity index 100%
rename from GPy/testing/likelihood_tests.py
rename to GPy/testing/test_likelihood.py
diff --git a/GPy/testing/linalg_test.py b/GPy/testing/test_linalg.py
similarity index 100%
rename from GPy/testing/linalg_test.py
rename to GPy/testing/test_linalg.py
diff --git a/GPy/testing/link_function_tests.py b/GPy/testing/test_link_function.py
similarity index 100%
rename from GPy/testing/link_function_tests.py
rename to GPy/testing/test_link_function.py
diff --git a/GPy/testing/mapping_tests.py b/GPy/testing/test_mapping.py
similarity index 100%
rename from GPy/testing/mapping_tests.py
rename to GPy/testing/test_mapping.py
diff --git a/GPy/testing/meanfunc_tests.py b/GPy/testing/test_meanfunc.py
similarity index 100%
rename from GPy/testing/meanfunc_tests.py
rename to GPy/testing/test_meanfunc.py
diff --git a/GPy/testing/minibatch_tests.py b/GPy/testing/test_minibatch.py
similarity index 100%
rename from GPy/testing/minibatch_tests.py
rename to GPy/testing/test_minibatch.py
diff --git a/GPy/testing/misc_tests.py b/GPy/testing/test_misc.py
similarity index 100%
rename from GPy/testing/misc_tests.py
rename to GPy/testing/test_misc.py
diff --git a/GPy/testing/model_tests.py b/GPy/testing/test_model.py
similarity index 100%
rename from GPy/testing/model_tests.py
rename to GPy/testing/test_model.py
diff --git a/GPy/testing/mpi_tests.py b/GPy/testing/test_mpi.py
similarity index 100%
rename from GPy/testing/mpi_tests.py
rename to GPy/testing/test_mpi.py
diff --git a/GPy/testing/pep_tests.py b/GPy/testing/test_pep.py
similarity index 100%
rename from GPy/testing/pep_tests.py
rename to GPy/testing/test_pep.py
diff --git a/GPy/testing/pickle_tests.py b/GPy/testing/test_pickle.py
similarity index 100%
rename from GPy/testing/pickle_tests.py
rename to GPy/testing/test_pickle.py
diff --git a/GPy/testing/plotting_tests.py b/GPy/testing/test_plotting.py
similarity index 100%
rename from GPy/testing/plotting_tests.py
rename to GPy/testing/test_plotting.py
diff --git a/GPy/testing/prior_tests.py b/GPy/testing/test_prior.py
similarity index 100%
rename from GPy/testing/prior_tests.py
rename to GPy/testing/test_prior.py
diff --git a/GPy/testing/quadrature_tests.py b/GPy/testing/test_quadrature.py
similarity index 100%
rename from GPy/testing/quadrature_tests.py
rename to GPy/testing/test_quadrature.py
diff --git a/GPy/testing/rv_transformation_tests.py b/GPy/testing/test_rv_transformation.py
similarity index 100%
rename from GPy/testing/rv_transformation_tests.py
rename to GPy/testing/test_rv_transformation.py
diff --git a/GPy/testing/serialization_tests.py b/GPy/testing/test_serialization.py
similarity index 100%
rename from GPy/testing/serialization_tests.py
rename to GPy/testing/test_serialization.py
diff --git a/GPy/testing/state_space_main_tests.py b/GPy/testing/test_state_space_main.py
similarity index 100%
rename from GPy/testing/state_space_main_tests.py
rename to GPy/testing/test_state_space_main.py
diff --git a/GPy/testing/svgp_tests.py b/GPy/testing/test_svgp.py
similarity index 100%
rename from GPy/testing/svgp_tests.py
rename to GPy/testing/test_svgp.py
diff --git a/GPy/testing/tp_tests.py b/GPy/testing/test_tp.py
similarity index 100%
rename from GPy/testing/tp_tests.py
rename to GPy/testing/test_tp.py
diff --git a/GPy/testing/util_tests.py b/GPy/testing/test_util.py
similarity index 100%
rename from GPy/testing/util_tests.py
rename to GPy/testing/test_util.py
diff --git a/GPy/testing/variational_tests.py b/GPy/testing/test_variational.py
similarity index 100%
rename from GPy/testing/variational_tests.py
rename to GPy/testing/test_variational.py
diff --git a/GPy/testing/todo.md b/GPy/testing/todo.md
new file mode 100644
index 00000000..4a7833d7
--- /dev/null
+++ b/GPy/testing/todo.md
@@ -0,0 +1,14 @@
+As off now, I am once through all of the tests and basic migration is done.
+
+Now, fix the below things and todos before starting to get the tests running using pytest
+
+
++ update test script names according to pytest conversion
++ check for TODOs
++ + there are many associated with "iscloseto" functions from np.testing. Will have to figure out how these
++ + some tests are not that clear to me tbh
++ check nomenclature of test files and test classes and test functions
++ chatgpt says that I should replace delta with the decimal but a delta of 1e-4 should be decimal=4. Not sure about this yet  but that is something I need to fix later on
+--> this gives more content to it: https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertAlmostEqual
+I need to write a custom function that behaves accordingly as in some cases, np.testing.assert_almost_equal won't be applicable, https://numpy.org/doc/stable/reference/generated/numpy.testing.assert_almost_equal.html
+or how about this: `np.testing.assert_allclose(pcopy.param_array, par.param_array, atol=1e-6)`
\ No newline at end of file