Regex on target names now generic

Removed test data specific regexes. Target names now conform to the
specification of the manual.