* refactor(core): Move tag collection into repository * Fix tests * Address feedback * Fix missing spot