Fix client id
Move tests around