Improve tests, secure shell exec