More updates for store-accept to get all the tests green, timeouts expan...

...ded, numbers updated, etc.