Convert to cli test, remove test dependencies