Refining and testing disable/enable API methods