First pass at resolving issues when testing with/without unicode_literals