Extending tests
Fixed example xml
Added more tests, based on examples