Save state: tests failure - not sure if reliable