Got client-side rebuild working
Added better test error state caputre