begin fixing up twisted intent dispatcher / tests