[#81910464] reorg of test files