New tests output according to previous changes
Comppute support and stats according to previous changes