Client testing expanded