switch to boost regex + tests