Fixes failing tests re child options