Improved disable() and added tests for it.
Improved the disable and destroy methods and the tests.