Remove benchmark from test task, rename identifier regexp