Test improvements, added lxml requirement
Fixed structure according to pep8