Better stop condition and support for empty translations

The title says it all:
The stop condition now supports tokens with "_" and "-".
Empty translations (token:"") are no longer ignored.
Some other test tweaks and code cleanup.