Add more scatter tests for different call variations