Tests for Storage and Fetchers. Redesign cancellation.