Reworked first test stats