Fix failing segmenting unittests