[noticket] Minor change to way tests are set-up to be more understood.