Add tests and code for missing arguments