Change args back to params.
Update tests a little.