Fix tests and refactor Base::makeConfigured().