Add entity UUID creation based on tag, Add unit tests, Refactor unit tests with helpers