Added should/be test support + add/remove pipes

Lots of cleaning up and fixing bugs