#116 fix up some tests around excluding branch points and maintain backward compatibility