Add countable for pipe
update tests