Revert dev/run-tests changes