Force uniqueness of module-stats
Add options override back into wrap
Connect aggregator stop/reset to archiver
Redo tests for new module-stats
Remove old archive test