Move some run tests to cli