Simplify encoding handling in client
Simplify UtilsTest