fixing tests; updating driver options
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test-connect.js