Updated client and tests with some new methods