Roughing out some better specs with Anne and Matt
Merge remote-tracking branch 'origin/test-improvements'

Conflicts:
	test/spec/matt-test.js