Reverted previous changes to avoid formatting the entire test file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/utils-dataobject-parser.js