String fixes
Bugfux: add missing elif
Bugfux: Escape quotes in regex str
Slight engine simplification
basic unit test framework