ported some more unit tests
make two internal EncodedText methods private
merge master