Fixing the tuples and log test.
Moving to a dispatcher typedef, so that it's possible to pipe dispatchers together.