all tests should use both encodings
Merge branch 'dominictarr-master'

Conflicts:
	test/auth.js
	test/util.js