Fixed more code

Used a previously unused function argument, and added more testing
parameters.