Fixing Canceled error state and failing tests