Always attach pvfs to scenarios; fix test
fix tests