tweaking test names and tags
Merge pull request #2581 from sebv/master

Tweaking test names and tags