Modernized segment definitions.
Adjusted one name.
Improved parameterized segment test.