Fix SPW delete test timeouts (see #11540).
Merge pull request #1797 from bpindelski/spw-delete-testfix

Fix SPW delete test timeouts (see #11540).