Fix tests
Merge branch 'derivative_kick_tests' into tuning_changes