Oil and Water setup for testing per tuning

[#44344753]