Formatting
Adjusted mock config & usage order