update test to pass
tidy up some stuff
advances to store ...