[test] Update test structure