Clean up too many/few argument warnings and update tests to use the correct format