Cleaned up code. Re-enabled the enable-disable test.