Add a client side test for the new behavior