Small fixes
Extend segment manager test