Also fix sporadic failures in test_builtin due to dependence on whether the
readline module has previously been imported.