Moved the id unwrapper to it's own class so we can test it