Add flexpath test
Modify for flexpath