Fixes for DisposalMethodDefinitionTest and ConditionalObserverTest