added 2d test
Merge branch 'sep-tails' of github.com:adrn/streams into sep-tails
don't use vdisp of satellite
Merge branch 'sep-tails' of github.com:adrn/streams into sep-tails