Improved tags with test updated