Basic regexp support
Improve test coverage