Changed optional parameter variable names and updated tests.