Made naming more consistent

Renamed arguments to parameters. Also refactored tests a bit.