Remove unused functions and add more test coverage

These strings should also be in the type section.