Fixing failing test due to previous refactoring of client.