more fixes and tests in the feature ordering in branches #232

Closed aloubyansky closed 6 years ago