Remove reference to fakespw from usage msg.
Simplify conditional logic.
Change logic for fixing failing tests.