Fixing broken test :mag:
Moving calls to client helper while I'm at it