Just updating main class with it as well. Now has a method which will remove the tests from the list if they aren't necessary for the environment