DRY up test a little; add forthcoming test placeholders
Extracted a constant for common usage
Test reorg/bucketizing
Added router test; improved testability of router subgenerator
Merge branch 'chore/add_tests'

Conflicts:
	test/test-file-creation.js