Add check to testing phase