- reverted test patch; buffer and catch parameters are available when testtools are installed before