Relocated the Make
Update the test runner
Avoid a conflict with a file of the same name on test runner
Merge branch 'enhance-the-test-automation' into development