Test cleanup: move CHECK close to code.