tests tidy. remove dead code and fix require spec_helper

Just a quick 2 minute clean up, I've left the majority into a story we can come back to.

/cc @annashipman @mikepea