Validator test
Added entity encoding
Added entity encoding