Removed unnecessary custom one element stream
Refactored equality tests to reduce complexity
Merge pull request #99 from kfgodel/96-short_circuit_and_flow

96 short circuit and flow