DisposableTests fixed