I hope this madness worked.
Improvements, improvements.
Added a hack to squeeze this into the 60 seconds we have before GAE shuts us down.
Merge branch 'feature/improve-coverage-speed' into develop