Client tests back to where they should be