Speed up client unit tests P1.