store: Memory store fixes & updates to tests