Fix tests to expect/pass correct args