Use correct Regex for 4.0 and 4.1 non-primary key test