Fixing test names and adding tags
Fixing test names and adding tags