More fixes for test suite.
Merge branch 'master' of git://github.com/flavour/eden

Conflicts:
	modules/tests/web2unittest.py
Merge branch 'master' of git://github.com/flavour/eden