Fix failing client side tests