Bring the BasicSaveUTest back to life

.. and get it to pass.