Improve IdParser regex and switch to generic ids in IdParserTests