Tests: Encoding utf-8 and adding a couple extra cases