Ihor Radchenko <yantar92@gmail.com> writes:

> [snip]

Please see the attached patch where I attempt to fix every issue you
pointed out.  I also split the tests into smaller functions for better
maintainability.  Please, let me know what you think about my latest
attempt.  Thank you for your guidance!

Rudy