Merge "Add junit-params to servicetests"