Addition of mechanism for testing disposable and throwing exceptions