Fix tests and create tagService