Update tests to reflect cloned options