Reworked Client tests