Work on adding client side testing