modified to run-tests