Add new tests for more code coverage
Allow UTF-8 output (fix for Macs)
Cover or