Was just checking up on this tonight... Are we good with the argument handling in this test file?

And if we are, is there anything else to take care of on this PR?