Fix service parameters and test