Improve test coverage; DTMF bugfix
Improve test coverage; bugfixes