Using apache commons Charsets & added unit tests