Added unit test for HeaderIdExtensions and switched to using a dictionary mapping