Changed from std::regex back to xpressive. Test added