[test] Reorganizing some tests