modify tests structure