Major refactoring of the test-running-procedure