Refactoring and addng some more stream matcher Tests