Flattend the tests filestructure