Test cleanup
Warning: during this cleanup it appeared that some tests were run multiple times, so we should see a dramatic reduction of the number of tests and thus the run time it takes.
Warning: during this cleanup it appeared that some tests were run multiple times, so we should see a dramatic reduction of the number of tests and thus the run time it takes.