Deprecating regexp fields

- Replaced regexp fields with source and target variable
- Added tests for new variables