Make test dir structure fit the common standard