Removing spec_helper require
Removing optional :header_id
Normalizing method signatures

In some cases I'm using header_id, in others not.