added supporteTags property
fixing tests
fixing tests, increasing test coverage