Fix smokey tests

Smokey tests have been failing, and so we haven't paid much attention to them. This pull request is an attempt to fix the broken windows so we might return to a state of redirector grace.

We might also consider:  
* our use of screens
* putting build status on screens
* turning on our screens
* other