Code and doctest fixes for returning tuples
Code and doctest fixes for returning tuples

Also slightly better error messages

Tests data set store tests should now pass.

alphagov/backdrop,alphagov/backdrop,alphagov/backdrop