More titlegiver test + small regexp fix