adding tags now fully unit tested