Fixed some unit tests
Improved html parser