Remove _base from test suite dir names