Modification on test-Runner