Test setup with changes for Training at start of April