More unittest fixes
Fixing yet another encoding bug