Adde html encode
Added more tests
Removed some files