Reworking how data is sent to a handler. More tests