Resolve conflicts and possibly improve test coverage on the tone list branch
Resolve conflicts and possibly improve test coverage on the tone list branch