improve match regex and remove webmock