Make handler tests green again