XD-1985 - Guava packaging cleanup - take 2
Added stream state tests

Improved assert message