Restore separation of rails_helper and spec_helper