added test subsetting for the client