marionette cleanup. uncomment jetpack, which wasn't what was breaking test-masters.  might be close!