Update tests from MRI 2.1 branch.
Add support for --disable flag.