Reorganize for multiple tests