Hello Michael, Kyotaro,
Please find attached the patch fixing the problem and the updated TAP testthat addresses Nit.
-- Regards,--Alexander Kukushkin