Rename tone spec, fix tests