improved Test identification