CDITCK-410 - Fixes for DisposalMethodDefinitionTest and ConditionalObserverTest