Tidied.
Make test more robust in development systems with existing data.
Fixed support data hangs in some mod_perl environments.

Conflicts:
	CHANGES.md