Update test.js
Conflicts:
	test/test.js