Change test to use a static file.
Merge branch 'master' into HTTPS-Server

Conflicts:
	test/config.js