Correct ExitUsageCheck
Refactoring in test suite