Updated comments tests
Updated tests for tags