test for sinks that can be sources, too
big tidy up so that sinks can also be throughs
2.18.0