Adding tags & unittests steps mechnism