Make handler test optional