Remove failing test from scaffold. No effect on system.
Merge pull request #1924 from edwardhunter/ehfix

Fix nightly.