reduced header size on TODO and Unit Tests