Merge enable/disable; fix tests.