Added back a line that was accidently removed
Removed unnecessary 'self's
Added a test pipe
Forgot to remove code during a refactor