Improving Tags with Test Updated

- Fixes #405