Improved tags with tests updated