Class doc
Cleanup
Added protocol and charset tests