move a spec around, and remove the requires for the old support stubs