Use autoload for requiring, clean up spec requires