Reworked the tests and code to incorporate the Tags, however i will not be able to add specific tag related functionality to the tests until the tag branch is merged in