Added tests for dispose confirmation
Merged code