Test for disabling contracts.
Minor bug fixes.