Modify tests to reflect new expected behavior
Merge remote-tracking branch 'origin/bugfix-fix-setstage-tests' into test-travis-headless