organizing tests into libraries
Using expandStream from bot

Keeping deprecated version locally for paranoia