CDITCK-410 - Minor fixes of DisposalMethodDefinitionTest and ConditionalObserverTest