Temp fix for MainTest until isValidated is replaced