That's roughy my interpretation as well. I like the idea that if you run out of tobacco then you can't retry tests! Might incorporate your version, it looks simple and neat :). I have backed the Companion, so am hoping for some more rules (And a Swyver's dialect dictionary maybe? :p )
As for dialect, try this:
https://www.pascalbonenfant.com/18c/cant/