include: Use the new type safe intrinsics in client.h
tests: Fix number correctness in a test