Adding ".test" in test file name.
Merge remote-tracking branch 'origin/next' into next

Conflicts:
	tasks/telemetrygentest.js