Minor modifications to the test tools