Added encoding
Added unit testing shell