Suggested fix for overlay test failures.
Merge pull request #1307 from asolove/fix-overlay-tests

Suggested fix for overlay test failures.