Add CLI timeout tests to standard client tests
Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality
Update docs