Make more tests pass
Make it work also for genshi