minor changes to block load/store/exchange tests