test: Various fixes for passing too many args