Merge "Add enable/disable test"