Added Tags and more tests