Changed tests back to be more similar to existing ones.
Merge branch 'standard-tests'

Conflicts:
	test/exclusion_test.js