PDIO-282 Proper handling of "tune" and "tuneMethod"