simplified regex logic, add new test to model