o/snapstate: test simplifications and fixes#16668

miguelpires wants to merge 1 commit intocanonical:mastercanonical/snapd:masterfrom

miguelpires:snapstate-test-fixesmiguelpires/snapd:snapstate-test-fixesCopy head branch name to clipboard