Stash: fix one tests, mark one as pending

Change-Id: I5e43e8c068263b399b57ef244c86c0ef26052947