Don't separate basic options from their according tests.  Due to lots
of interdependencies, we won't do that for the plugins yet.