Fixed client side tests