Additional work to get client side tests working