I'm not sure if it's a good idea to mix identifier and locale depended tests.
But if you like it more i could undo the commits and implement it as macro.