fixing next::method
pulling in the TestBuilder stuff from the old prototype