Refactor test and reproduce another issue found as part of issue #90
Fix the "IllegalArgumentException - Uparseable UTF-8" issue found when investigating issue #90