Added more unit tests

Add/Remove Tags/Fields
Unit tests