Clean up spec helper and remove Spork references