UC-54 Suggested updates for current pull request

All this class was used for was to test each defined tag above in the now deleted ```availableTags```