Add tests (eval code) and fix regex & docblock