Speed up tests by brining the garbage collection hack over too
I don't think there's anything else we need from here
Shouldn't be needed as we use Travis
<% %> style block helpers are deprecated