Uses new configuration headers in spec_helper

That's what I get for changing something and then not running the tests. ;-)