Better handling of pre/post test stats collection