More Tests
Change lists to streams