Adding support for the automated tests to be run from the test-suite