updated assertion method arguments

Made argument names of assertion methods less ambiguous.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	script/tests/assertions.js