More test cleanup, then added 'usage' route option.
Formatting