Fixed tests after stream changes
Cleanup of applicative definition