Moved logic to ConsoleWorkingIndicator & MathTest