fixed client side testing