Refactor Module tests
Merge remote-tracking branch 'origin/pr/1008' into 1.7

Conflicts:
	spec/javascripts/module.stop.spec.js