Regexp changed, removed some noise from tests