Add isLoading/isDeleted flags, check for them in tests