Simplify run-tests