Check that cleanup occurs when overrides are set/removed