Test and refactor missing parameter behaviour