Added support for client side tests