Splitting out client tests