refactor(client): simplify code
refactor(mocks): simplify code
perf(client): exit loop on first false