Add better structure for test path array.