Upgrading saws version, store tests

Slightly unfortunate overload of `s3 the `val` and `def`. Should we rename them?