Added more client side tests