Improvements between catch-requirejs-error and no-animation-tests

Together, the two patches resulted in some unpredictable behavior -- this both
speeds things up and makes the tests run more consistently.