Better detune test, and fixed several missing arguments in calls