Ported back validation tests