start splitting the big ClientTest in smaller files