NAS-2384 Fixing wayback resourcestore tests (disabled a couple).