Fixed up some tests, trying to fix Jenkins build

In order to deploy Jessica's new stats I'm quickly fixing up some broken windows.