Updates to withHandler docs and tests