Some test adaptations because of Baggy streamline