Adding expect; renaming isEnabled.